diff --git a/bib/cmd/bootc-image-builder/image.go b/bib/cmd/bootc-image-builder/image.go
index f4ece9cc..e32ca55d 100644
--- a/bib/cmd/bootc-image-builder/image.go
+++ b/bib/cmd/bootc-image-builder/image.go
@@ -307,19 +307,11 @@ func manifestForDiskImage(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest
 	mf.Distro = manifest.DISTRO_FEDORA
 	runner := &runner.Linux{}
 
-	// Remove the "NewBootcLegacyDiskImage" if part below and
-	// *only* use the "else" part of the code once either of the
-	// following is available in centos/rhel
-	// https://github.com/containers/bootc/pull/462
-	// https://www.mail-archive.com/qemu-devel@nongnu.org/msg1034508.html
-	if c.Architecture != arch.Current() {
-		legacyImg := image.NewBootcLegacyDiskImage(img)
-		err = legacyImg.InstantiateManifestFromContainers(&mf, []container.SourceSpec{containerSource}, runner, rng)
-	} else {
-		err = img.InstantiateManifestFromContainers(&mf, []container.SourceSpec{containerSource}, runner, rng)
+	if err := img.InstantiateManifestFromContainers(&mf, []container.SourceSpec{containerSource}, runner, rng); err != nil {
+		return nil, err
 	}
 
-	return &mf, err
+	return &mf, nil
 }
 
 func labelForISO(os *source.OSRelease, arch *arch.Arch) string {
diff --git a/test/testcases.py b/test/testcases.py
index f6425d5e..6604b76c 100644
--- a/test/testcases.py
+++ b/test/testcases.py
@@ -77,11 +77,8 @@ def gen_testcases(what):  # pylint: disable=too-many-return-statements
         ]
         # do a cross arch test too
         if platform.machine() == "x86_64":
-            # TODO: re-enable once
-            # https://github.com/osbuild/bootc-image-builder/issues/619
-            # is resolved
-            # test_cases.append(
-            #    TestCaseCentos(image="raw", target_arch="arm64"))
+            test_cases.append(
+                TestCaseCentos(image="raw", target_arch="arm64"))
             pass
         elif platform.machine() == "arm64":
             # TODO: add arm64->x86_64 cross build test too