diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 6bbb24ccf6..317f876dc5 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -56,6 +56,7 @@ jobs:
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: CI Setup Script
+        if: !matrix.pkg.labels ["mock"]
         run: |
           dir=$(dirname ${{ matrix.pkg.pkg }})
           if [ -f $dir/ci_setup.rhai ]; then
@@ -63,16 +64,13 @@ jobs:
           fi
 
       - name: Install Build Dependencies
+        if: !matrix.pkg.labels ["mock"]
         run: |
           dir=$(dirname ${{ matrix.pkg.pkg }})
           dnf5 builddep -y ${dir}/*.spec
 
       - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} -rrpmbuild
-
-      - name: Build with Andaman (alternate arch)
-        if: matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib']
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c terra-${{ matrix.version }}-i386
+        run: anda build ${{ matrix.pkg.pkg }} ${{ matrix.pkg.labels['mock'] && '-c terra-${{ matrix.version }}-${{ matrix.pkg.arch }}' || '-rrpmbuild' }}
 
       - name: Generating artifact name
         id: art
diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml
index faf88abe41..99a3cdb2e4 100644
--- a/.github/workflows/json-build.yml
+++ b/.github/workflows/json-build.yml
@@ -27,6 +27,7 @@ jobs:
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: CI Setup Script
+        if: !matrix.pkg.labels ["mock"]
         run: |
           dir=$(dirname ${{ matrix.pkg.pkg }})
           if [ -f $dir/ci_setup.rhai ]; then
@@ -34,12 +35,13 @@ jobs:
           fi
 
       - name: Install Build Dependencies
+        if: !matrix.pkg.labels ["mock"]
         run: |
           dir=$(dirname ${{ matrix.pkg.pkg }})
           dnf5 builddep -y ${dir}/*.spec
 
       - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} -rrpmbuild
+        run: anda build ${{ matrix.pkg.pkg }} ${{ matrix.pkg.labels['mock'] && '-c terra-${{ matrix.version }}-${{ matrix.pkg.arch }}' || '-rrpmbuild' }}
 
       - name: Generating artifact name
         id: art
diff --git a/anda/fusion/kmod-v4l2loopback/anda.hcl b/anda/fusion/kmod-v4l2loopback/anda.hcl
index e5fb6fbc2b..329861eb08 100644
--- a/anda/fusion/kmod-v4l2loopback/anda.hcl
+++ b/anda/fusion/kmod-v4l2loopback/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "kmod-v4l2loopback.spec"
     }
+    labels {
+        mock = 1
+    }
 }
diff --git a/anda/games/gamescope-legacy/anda.hcl b/anda/games/gamescope-legacy/anda.hcl
index 272907ad53..db9bd0608a 100644
--- a/anda/games/gamescope-legacy/anda.hcl
+++ b/anda/games/gamescope-legacy/anda.hcl
@@ -1,8 +1,6 @@
 project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
     rpm {
         spec = "gamescope-legacy.spec"
     }
-    labels {
-        multilib = 1
-    }
 }
diff --git a/anda/games/gamescope/anda.hcl b/anda/games/gamescope/anda.hcl
index 9aee67abdf..f3bf32281b 100755
--- a/anda/games/gamescope/anda.hcl
+++ b/anda/games/gamescope/anda.hcl
@@ -1,9 +1,9 @@
 project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
 	rpm {
 		spec = "gamescope.spec"
 	}
 	labels {
-		multilib = 1
 		extra = 1
 	}
 }
diff --git a/anda/lib/mesa/anda.hcl b/anda/lib/mesa/anda.hcl
index 7714a0b452..0a9eb9553e 100644
--- a/anda/lib/mesa/anda.hcl
+++ b/anda/lib/mesa/anda.hcl
@@ -1,9 +1,9 @@
 project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
         rpm {
 		spec = "mesa.spec"
 	}
     labels {
-        multilib = 1
         extra = 1
     }
 }
diff --git a/anda/misc/extest/anda.hcl b/anda/misc/extest/anda.hcl
index 9546109527..8c444ab5c5 100644
--- a/anda/misc/extest/anda.hcl
+++ b/anda/misc/extest/anda.hcl
@@ -1,8 +1,6 @@
 project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
 	rpm {
 		spec = "rust-extest.spec"
 	}
-	labels {
-	    multilib = 1
-    }
 }
diff --git a/anda/system/mesa-freeworld/anda.hcl b/anda/system/mesa-freeworld/anda.hcl
index d30486b421..b10d43824d 100644
--- a/anda/system/mesa-freeworld/anda.hcl
+++ b/anda/system/mesa-freeworld/anda.hcl
@@ -1,9 +1,9 @@
 project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
     rpm {
         spec = "mesa-freeworld.spec"
     }
     labels {
         updbranch = 1
-        multilib = 1
     }
 }
diff --git a/anda/system/xpadneo/anda.hcl b/anda/system/xpadneo/anda.hcl
index a05aac8e28..522f0b2ff8 100644
--- a/anda/system/xpadneo/anda.hcl
+++ b/anda/system/xpadneo/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
 	rpm {
 		spec = "xpadneo.spec"
 	}
+	labels {
+		mock = 1
+	}
 }
diff --git a/anda/system/zenpower3/anda.hcl b/anda/system/zenpower3/anda.hcl
index 288539e071..64d15acce8 100644
--- a/anda/system/zenpower3/anda.hcl
+++ b/anda/system/zenpower3/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
 	rpm {
 		spec = "zenpower3.spec"
 	}
+	labels {
+		mock = 1
+	}
 }