diff --git a/.github/workflows/snap_packaging_jobs.yml b/.github/workflows/snap_packaging_jobs.yml
index 1ad26c3e9..88c097b68 100644
--- a/.github/workflows/snap_packaging_jobs.yml
+++ b/.github/workflows/snap_packaging_jobs.yml
@@ -140,9 +140,11 @@ jobs:
     - name: Install armhf dependencies
       if: ${{ matrix.arch-name == 'armhf' }}
       run: |-
-        sudo dpkg --add-architecture "armhf"
+        sudo dpkg --add-architecture armhf
         sudo apt-get update
-        sudo apt-get install -y nginx-light snapd:armhf
+        # apparmor will conflict with snapd:armhf dependency if not removed first
+        sudo apt-get remove -y apparmor
+        sudo apt-get install -y --no-install-recommends snapd:armhf nginx-light
     - name: Install non-armhf depdencies
       if: ${{ matrix.arch-name != 'armhf' }}
       run: |-
diff --git a/.github/workflows/test_and_package_stage.yml b/.github/workflows/test_and_package_stage.yml
index 0fe54c14e..7adc94095 100644
--- a/.github/workflows/test_and_package_stage.yml
+++ b/.github/workflows/test_and_package_stage.yml
@@ -25,39 +25,9 @@ jobs:
   #   with:
   #     dockerTag: ${{ inputs.dockerTag }}
   #   secrets: inherit
-  # snap_packaging_jobs:
-  #   name: Snap packaging
-  #   uses: "./.github/workflows/snap_packaging_jobs.yml"
-  #   with:
-  #     snapBuildTimeout: ${{ inputs.snapBuildTimeout }}
-  #   secrets: inherit
-  snap_run:
-    name: snap_run ${{ matrix.arch-name }}
-    runs-on:
-      - ${{ matrix.run-on }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - arch-name: armhf
-          run-on: ubuntu-24.04-arm
-    steps:
-    - name: checkout
-      uses: actions/checkout@v6.0.2
-    - uses: actions/setup-python@v5.0.0
-      with:
-        python-version: '3.12'
-    - name: Install armhf dependencies
-      if: ${{ matrix.arch-name == 'armhf' }}
-      run: |-
-        sudo dpkg --add-architecture armhf
-        sudo apt-get update
-        sudo apt-get install -y nginx-light
-        echo "nginx light installed"
-        sudo apt-get remove -y apparmor
-        sudo apt-get install -y --no-install-recommends snapd:armhf
-        echo "snapd:armhf installed"
-    - name: Setup venv
-      run: |-
-        python3 -m venv venv
-        venv/bin/python tools/pip_install.py -U tox
+  snap_packaging_jobs:
+    name: Snap packaging
+    uses: "./.github/workflows/snap_packaging_jobs.yml"
+    with:
+      snapBuildTimeout: ${{ inputs.snapBuildTimeout }}
+    secrets: inherit