diff --git a/.github/workflows/glassdoor.yaml b/.github/workflows/ax3200.yaml
similarity index 61%
rename from .github/workflows/glassdoor.yaml
rename to .github/workflows/ax3200.yaml
index e08e498..fa958b2 100644
--- a/.github/workflows/glassdoor.yaml
+++ b/.github/workflows/ax3200.yaml
@@ -1,18 +1,21 @@
-name: OpenWrt for Mediatek_mt7988a_bpi-r4 and release
+---
+# Based on https://github.com/glassd00r/Openwrt_Builder/tree/main
+name: Build OpenWRT for Xiaomi AX3200
 
 on:
   workflow_dispatch:
+  push:
 
 env:
-  REMOTE_REPOSITORY: glassd00r/openwrt
-  REMOTE_BRANCH: main
-  CONFIG_FILE: bpi-r4.config
-  MTK_PPE_ENTRIES_SHIFT_PATCH: 001-32k_ppe.patch
-  PREFETCH_PATCH: 002-prefetch.patch
-  CUSTOM_FILES_PATH: files/
-  RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4
+  # REMOTE_REPOSITORY: openwrt/openwrt
+  # REMOTE_BRANCH: main
+  REMOTE_REPOSITORY: danpawlik/openwrt
+  REMOTE_BRANCH: bpi-r4
+  RELEASE_PREFIX: Mediatek_mt7622_ax3200
+  DEVICE_CONFIG: configs/mediatek/mt7622/ax3200
+  ROLE_CONFIG: configs/common/dumb_ap
 
-jobs:  
+jobs:
   build:
     name: Build OpenWrt
     runs-on: ubuntu-24.04
@@ -25,43 +28,43 @@ jobs:
             gcc-multilib g++-multilib gettext git libncurses5-dev libssl-dev \
             python3-setuptools rsync swig unzip zlib1g-dev file wget
           sudo apt full-upgrade -y
+
       - name: Checkout remote repository
         uses: actions/checkout@v4
         with:
           repository: ${{ env.REMOTE_REPOSITORY }}
           ref: ${{ env.REMOTE_BRANCH }}
+
       - name: Checkout current repository
         uses: actions/checkout@v4
         with:
           path: "custom_repo"
+
       - name: Update and install feeds
         run: |
           ./scripts/feeds update -a
           ./scripts/feeds install -a
-      - name: Apply 32K PPE Patch
-        run: |
-          mv custom_repo/patches/BPI-r4/${{ env.MTK_PPE_ENTRIES_SHIFT_PATCH }} target/linux/mediatek/patches-6.6/${{ env.MTK_PPE_ENTRIES_SHIFT_PATCH }}
-          cd target/linux/mediatek/patches-6.6
-          git apply ${{ env.MTK_PPE_ENTRIES_SHIFT_PATCH }}
+
       - name: Configure firmware image
         run: |
-          mv custom_repo/${{ env.CONFIG_FILE }} .config
+          cp custom_repo/${{ env.DEVICE_CONFIG }} .config
+          cat custom_repo/${{ env.ROLE_CONFIG }} >> .config
           make defconfig
-      - name: Include custom files
-        run: |
-          mkdir -p ${{ env.CUSTOM_FILES_PATH }}
-          mv custom_repo/BPI-r4/${{ env.CUSTOM_FILES_PATH }}* ${{ env.CUSTOM_FILES_PATH }}
+
       - name: Download dependencies
-        run: make -j $(($(nproc)+1)) download
+        run: make -j $(nproc) download
+
       - name: Build the firmware image
-        run: make -j $(($(nproc)+1)) world
+        run: make -j $(nproc) world
+
       - name: Package output
-        run: tar -cvf bpi_r4-images.tar bin/targets/mediatek/filogic
+        run: tar -cvf ax_3200-images.tar bin/targets/mediatek/mt7622
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: bpi_r4-images
-          path: bpi_r4-images.tar
+          name: ax_3200-images
+          path: ax_3200-images.tar
 
   release:
     name: Create release
@@ -72,20 +75,23 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: bpi_r4-images
+          name: ax_3200-images
       - name: Extract artifacts
-        run: tar xf bpi_r4-images.tar
+        run: tar xf ax_3200-images.tar
+
       - name: Get current date
         run: echo "RELEASE_DATE=$(date +%F)" >> $GITHUB_ENV
+
       - name: Create release
         uses: softprops/action-gh-release@master
         with:
-          files: bin/targets/mediatek/filogic/*
+          files: bin/targets/mediatek/mt7622/*
           tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.RELEASE_DATE }}
-          name: Openwrt BPI-r4 ${{ env.RELEASE_DATE }}
+          name: Openwrt AX3200 ${{ env.RELEASE_DATE }}
           body: |
             Updated prebuilt images for ${{ env.RELEASE_DATE }}
             Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }}
+
       - name: Clean up old releases
         uses: dev-drprasad/delete-older-releases@master
         with:
diff --git a/.github/workflows/ax3600.yaml b/.github/workflows/ax3600.yaml
new file mode 100644
index 0000000..12d1257
--- /dev/null
+++ b/.github/workflows/ax3600.yaml
@@ -0,0 +1,104 @@
+---
+# Based on https://github.com/glassd00r/Openwrt_Builder/tree/main
+# It includes the NSS package: https://github.com/qosmio/nss-packages
+name: Build OpenWRT for Xiaomi AX3600 NSS build
+
+on:
+  workflow_dispatch:
+  push:
+
+env:
+  # REMOTE_REPOSITORY: openwrt/openwrt
+  # REMOTE_BRANCH: main
+  REMOTE_REPOSITORY: qosmio/openwrt-ipq
+  REMOTE_BRANCH: qualcommax-6.x-nss-wifi
+  RELEASE_PREFIX: IPQ_8074_ax3600
+  DEVICE_CONFIG: configs/qualcommax/ax3600
+  ROLE_CONFIG: configs/common/main-router
+  NSS_CONFIG: configs/common/nss
+
+jobs:
+  build:
+    name: Build OpenWrt
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y \
+            build-essential clang flex bison g++ gawk \
+            gcc-multilib g++-multilib gettext git libncurses5-dev libssl-dev \
+            python3-setuptools rsync swig unzip zlib1g-dev file wget
+          sudo apt full-upgrade -y
+
+      - name: Checkout remote repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ env.REMOTE_REPOSITORY }}
+          ref: ${{ env.REMOTE_BRANCH }}
+
+      - name: Checkout current repository
+        uses: actions/checkout@v4
+        with:
+          path: "custom_repo"
+
+      - name: Update and install feeds
+        run: |
+          ./scripts/feeds update -a
+          ./scripts/feeds install -a
+
+      - name: Configure firmware image
+        run: |
+          cp custom_repo/${{ env.DEVICE_CONFIG }} .config
+          cat custom_repo/${{ env.ROLE_CONFIG }} >> .config
+          cat custom_repo/${{ env.NSS_CONFIG }} >> .config
+          make defconfig
+
+      - name: Download dependencies
+        run: make -j $(nproc) download
+
+      - name: Build the firmware image
+        run: make -j $(nproc) world
+
+      - name: Package output
+        run: tar -cvf ax_3600-images.tar bin/targets/qualcommax/ipq807x
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ax_3600-images
+          path: ax_3600-images.tar
+
+  release:
+    name: Create release
+    needs: [build]
+    if: needs.build.result == 'success'
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: ax_3600-images
+      - name: Extract artifacts
+        run: tar xf ax_3600-images.tar
+
+      - name: Get current date
+        run: echo "RELEASE_DATE=$(date +%F)" >> $GITHUB_ENV
+
+      - name: Create release
+        uses: softprops/action-gh-release@master
+        with:
+          files: bin/targets/qualcommax/ipq807x/*
+          tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.RELEASE_DATE }}
+          name: Openwrt AX3600-NSS ${{ env.RELEASE_DATE }}
+          body: |
+            Updated prebuilt images for ${{ env.RELEASE_DATE }}
+            Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }}
+
+      - name: Clean up old releases
+        uses: dev-drprasad/delete-older-releases@master
+        with:
+          keep_latest: 5
+          delete_tags: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}