diff --git a/.github/workflows/build-test-push.yml b/.github/workflows/build-test-push.yml
index 792674d..099934b 100644
--- a/.github/workflows/build-test-push.yml
+++ b/.github/workflows/build-test-push.yml
@@ -444,22 +444,25 @@ jobs:
               # Run the image and query almalinux-release package's architecture
               arch=$( docker run --rm rootfs /bin/bash -c "rpm -q --qf=%{ARCH} ${almalinux_release}" )
 
-              # Map found architecture to the corresponding platform
-              platform=
+              # Map found architecture to the corresponding platforms
+              platforms=
               docker rmi rootfs
               case ${arch} in
                 i686)
-                  platform=386;;
+                  platforms=386;;
                 x86_64)
-                  platform=amd64;;
+                  platforms=amd64
+                  [[ ${{ matrix.version_major }} = '10'* ]] && \
+                    platforms="amd64 amd64_v3"
+                   ;;
                 x86_64_v2)
-                  platform=amd64_v2;;
+                  platforms=amd64_v2;;
                 ppc64le)
-                  platform=ppc64le;;
+                  platforms=ppc64le;;
                 s390x)
-                  platform=s390x;;
+                  platforms=s390x;;
                 aarch64)
-                  platform=arm64;;
+                  platforms=arm64;;
                 *)
                   echo "The '$arch' is incorrect or failed to determine architecture." && false;;
               esac
@@ -468,9 +471,12 @@ jobs:
               rm -f rootfs.tar.gz
 
               # Copy the "taken RootFS" into corresponded .tar.xz
-              cp -av ${file} ${name}-${platform}.tar.gz
-              zcat ${name}-${platform}.tar.gz | xz -9 -e -T0 > ${pwd}/${{ matrix.version_major }}/${{ matrix.image_types }}/${platform}/${name}-${platform}.tar.xz
-
+              for platform in $platforms; do
+                # Skip if the rootfs for specific platform exists. That's for the "amd64 amd64_v3" case
+                [ -f ${name}-${platform}.tar.gz ] && continue
+                cp -av ${file} ${name}-${platform}.tar.gz
+                zcat ${name}-${platform}.tar.gz | xz -9 -e -T0 > ${pwd}/${{ matrix.version_major }}/${{ matrix.image_types }}/${platform}/${name}-${platform}.tar.xz
+              done
             fi
           done
 
diff --git a/Containerfiles/10-kitten/Containerfile.base b/Containerfiles/10-kitten/Containerfile.base
index 0d0c2b6..8b3925a 100644
--- a/Containerfiles/10-kitten/Containerfile.base
+++ b/Containerfiles/10-kitten/Containerfile.base
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir -p /mnt/sys-root; \
diff --git a/Containerfiles/10-kitten/Containerfile.default b/Containerfiles/10-kitten/Containerfile.default
index b428992..843df83 100644
--- a/Containerfiles/10-kitten/Containerfile.default
+++ b/Containerfiles/10-kitten/Containerfile.default
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir /mnt/sys-root; \
diff --git a/Containerfiles/10-kitten/Containerfile.init b/Containerfiles/10-kitten/Containerfile.init
index 44f0562..6f3c910 100644
--- a/Containerfiles/10-kitten/Containerfile.init
+++ b/Containerfiles/10-kitten/Containerfile.init
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir /mnt/sys-root; \
diff --git a/Containerfiles/10-kitten/Containerfile.micro b/Containerfiles/10-kitten/Containerfile.micro
index 146f16f..f22012b 100644
--- a/Containerfiles/10-kitten/Containerfile.micro
+++ b/Containerfiles/10-kitten/Containerfile.micro
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir -p /mnt/sys-root; \
diff --git a/Containerfiles/10-kitten/Containerfile.minimal b/Containerfiles/10-kitten/Containerfile.minimal
index 9647823..7642824 100644
--- a/Containerfiles/10-kitten/Containerfile.minimal
+++ b/Containerfiles/10-kitten/Containerfile.minimal
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten
 FROM ${SYSBASE} as system-build
 
 RUN mkdir /mnt/sys-root; \
diff --git a/Containerfiles/10-kitten/Containerfile.toolbox b/Containerfiles/10-kitten/Containerfile.toolbox
index f01e965..44ff348 100644
--- a/Containerfiles/10-kitten/Containerfile.toolbox
+++ b/Containerfiles/10-kitten/Containerfile.toolbox
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir -p /mnt/sys-root; \
diff --git a/Containerfiles/10/Containerfile.base b/Containerfiles/10/Containerfile.base
index 4fd5502..5893b50 100644
--- a/Containerfiles/10/Containerfile.base
+++ b/Containerfiles/10/Containerfile.base
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir -p /mnt/sys-root; \
diff --git a/Containerfiles/10/Containerfile.default b/Containerfiles/10/Containerfile.default
index 272d346..1723930 100644
--- a/Containerfiles/10/Containerfile.default
+++ b/Containerfiles/10/Containerfile.default
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir /mnt/sys-root; \
diff --git a/Containerfiles/10/Containerfile.init b/Containerfiles/10/Containerfile.init
index c63fd09..887dbd3 100644
--- a/Containerfiles/10/Containerfile.init
+++ b/Containerfiles/10/Containerfile.init
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir /mnt/sys-root; \
diff --git a/Containerfiles/10/Containerfile.micro b/Containerfiles/10/Containerfile.micro
index 260b86a..b372104 100644
--- a/Containerfiles/10/Containerfile.micro
+++ b/Containerfiles/10/Containerfile.micro
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir -p /mnt/sys-root; \
diff --git a/Containerfiles/10/Containerfile.minimal b/Containerfiles/10/Containerfile.minimal
index 3ab92cc..cdf6619 100644
--- a/Containerfiles/10/Containerfile.minimal
+++ b/Containerfiles/10/Containerfile.minimal
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10
 FROM ${SYSBASE} as system-build
 
 RUN mkdir /mnt/sys-root; \
diff --git a/Containerfiles/10/Containerfile.toolbox b/Containerfiles/10/Containerfile.toolbox
index fb1450d..94c2c9c 100644
--- a/Containerfiles/10/Containerfile.toolbox
+++ b/Containerfiles/10/Containerfile.toolbox
@@ -1,4 +1,4 @@
-ARG SYSBASE=quay.io/almalinuxorg/almalinux:10
+ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10
 FROM ${SYSBASE} AS system-build
 
 RUN mkdir -p /mnt/sys-root; \