diff --git a/.github/workflows/build-yocto.yml b/.github/workflows/build-yocto.yml
index a6a34aa1c..ba999391d 100644
--- a/.github/workflows/build-yocto.yml
+++ b/.github/workflows/build-yocto.yml
@@ -75,8 +75,6 @@ jobs:
           - name: poky-altcfg
             yamlfile: ""
           - name: qcom-distro
-            yamlfile: ':ci/qcom-distro.yml'
-          - name: qcom-distro-prop-image
             yamlfile: ':ci/qcom-distro-prop-image.yml'
         kernel:
           - type: default
@@ -114,14 +112,11 @@ jobs:
           - qcs8300-ride-sx
           - qcs9100-ride-sx
           - qrb2210-rb1-core-kit
-          - qcom-armv7a
           - sm8750-mtp
         distro:
           - name: poky-altcfg
             yamlfile: ""
           - name: qcom-distro
-            yamlfile: ':ci/qcom-distro.yml'
-          - name: qcom-distro-prop-image
             yamlfile: ':ci/qcom-distro-prop-image.yml'
         kernel:
           - type: default
@@ -132,7 +127,7 @@ jobs:
           - machine: qcom-armv8a
             distro:
                 name: qcom-distro
-                yamlfile: ':ci/qcom-distro.yml'
+                yamlfile: ':ci/qcom-distro-prop-image.yml'
             kernel:
                 type: additional
                 dirname: "+linux-yocto-dev"
@@ -140,16 +135,27 @@ jobs:
           - machine: qcom-armv8a
             distro:
                 name: qcom-distro
-                yamlfile: ':ci/qcom-distro.yml'
+                yamlfile: ':ci/qcom-distro-prop-image.yml'
             kernel:
                 type: additional
                 dirname: "+linux-yocto-lts"
                 yamlfile: ":ci/linux-yocto-lts.yml"
-        exclude:
-          # Incompatible builds
           - machine: qcom-armv7a
             distro:
-                name: qcom-distro-prop-image
+                name: poky-altcfg
+                yamlfile: ''
+            kernel:
+                type: default
+                dirname: ""
+                yamlfile: ""
+          - machine: qcom-armv7a
+            distro:
+                name: qcom-distro
+                yamlfile: ':ci/qcom-distro.yml'
+            kernel:
+                type: default
+                dirname: ""
+                yamlfile: ""
     name: ${{ matrix.machine }}/${{ matrix.distro.name }}${{ matrix.kernel.dirname }}
     steps:
       - uses: actions/checkout@v4
diff --git a/ci/qcom-distro-prop-image.yml b/ci/qcom-distro-prop-image.yml
index 140009899..e273fa8ed 100644
--- a/ci/qcom-distro-prop-image.yml
+++ b/ci/qcom-distro-prop-image.yml
@@ -5,4 +5,6 @@ header:
   includes:
    - ci/qcom-distro.yml
 
-target: qcom-multimedia-proprietary-image
+target:
+  - qcom-multimedia-image
+  - qcom-multimedia-proprietary-image