diff --git a/.full_config b/.full_config
index b759f079da3345..3f96638d2f4bdb 100644
--- a/.full_config
+++ b/.full_config
@@ -2108,8 +2108,8 @@ CONFIG_PACKAGE_nss-firmware-default=y
 #
 # Select NSS firmware version
 #
-CONFIG_NSS_FIRMWARE_VERSION_12_1=y
-# CONFIG_NSS_FIRMWARE_VERSION_11_4 is not set
+# CONFIG_NSS_FIRMWARE_VERSION_12_1 is not set
+CONFIG_NSS_FIRMWARE_VERSION_11_4=y
 # end of NSS Firmware Version
 
 CONFIG_PACKAGE_nss-firmware-ipq8074=y
diff --git a/.github/workflows/ipq807x.yaml b/.github/workflows/ipq807x.yaml
index f1b066901e57aa..57043e39ae6020 100644
--- a/.github/workflows/ipq807x.yaml
+++ b/.github/workflows/ipq807x.yaml
@@ -1,4 +1,4 @@
-name: Build IPQ807x NSS WiFi
+name: Build IPQ807x NSS WiFi Mesh
 
 on: workflow_dispatch
 
@@ -62,9 +62,9 @@ jobs:
             - name: Create a release
               uses: "ncipollo/release-action@v1"
               with:
-                name: "Updated prebuilt images (NSS-WiFi) ${{ env.NOW }}"
-                commit: "main_nss"
-                tag: "ipq807x-nsswifi-${{ env.NOW }}"
+                name: "Updated prebuilt images (NSS-WiFi with Mesh) ${{ env.NOW }}"
+                commit: "main_nss_mesh"
+                tag: "ipq807x-nsswifi-mesh-${{ env.NOW }}"
                 generateReleaseNotes: true
                 makeLatest: true
                 artifacts: bin/targets/qualcommax/ipq807x/*