diff --git a/.github/config/config-plus-azure b/.github/config/config-plus-azure
index bcccd67e77..69bf43c703 100644
--- a/.github/config/config-plus-azure
+++ b/.github/config/config-plus-azure
@@ -6,6 +6,7 @@ export TARGET_NAP_WAF_DOS_IMAGE_PREFIX="marketplaceimages/nginx-plus-ingress-nap
 declare -a PLUS_TAG_POSTFIX_LIST=("")
 declare -a NAP_WAF_TAG_POSTFIX_LIST=("")
 declare -a NAP_DOS_TAG_POSTFIX_LIST=("")
+declare -a NAP_WAFV5_TAG_POSTFIX_LIST=()
 declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("")
 declare -a ADDITIONAL_TAGS=()
 export PUBLISH_OSS=false
diff --git a/.github/config/config-plus-ecr b/.github/config/config-plus-ecr
index 452fa6f124..a59a460a1a 100644
--- a/.github/config/config-plus-ecr
+++ b/.github/config/config-plus-ecr
@@ -3,9 +3,10 @@ export TARGET_PLUS_IMAGE_PREFIX=nginx/nginx-plus-ingress
 export TARGET_NAP_WAF_IMAGE_PREFIX=nginx/nginx-plus-ingress-nap
 export TARGET_NAP_DOS_IMAGE_PREFIX=nginx/nginx-plus-ingress-dos
 export TARGET_NAP_WAF_DOS_IMAGE_PREFIX=nginx/nginx-plus-ingress-dos-nap
-declare -a PLUS_TAG_POSTFIX_LIST=("-mktpl" "-alpine-mktpl" "-alpine-mktpl-fips")
-declare -a NAP_WAF_TAG_POSTFIX_LIST=("-mktpl" "-ubi-mktpl")
-declare -a NAP_DOS_TAG_POSTFIX_LIST=("-mktpl" "-ubi-mktpl")
-declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("-mktpl" "-ubi-mktpl")
+declare -a PLUS_TAG_POSTFIX_LIST=("-mktpl")
+declare -a NAP_WAF_TAG_POSTFIX_LIST=("-mktpl")
+declare -a NAP_DOS_TAG_POSTFIX_LIST=("-mktpl")
+declare -a NAP_WAFV5_TAG_POSTFIX_LIST=()
+declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("-mktpl")
 declare -a ADDITIONAL_TAGS=()
 export PUBLISH_OSS=false
diff --git a/.github/config/config-plus-gcr-public b/.github/config/config-plus-gcr-public
index f508554928..71cee5dc28 100644
--- a/.github/config/config-plus-gcr-public
+++ b/.github/config/config-plus-gcr-public
@@ -6,5 +6,6 @@ export TARGET_NAP_WAF_IMAGE_PREFIX=nginxinc/nginx-plus-ingress-nap
 export TARGET_NAP_DOS_IMAGE_PREFIX=nginxinc/nginx-plus-ingress-dos
 declare -a PLUS_TAG_POSTFIX_LIST=("")
 declare -a NAP_WAF_TAG_POSTFIX_LIST=("")
-declare -a NAP_DOS_TAG_POSTFIX_LIST=("")
+declare -a NAP_WAFV5_TAG_POSTFIX_LIST=()
+declare -a NAP_DOS_TAG_POSTFIX_LIST=()
 declare -a ADDITIONAL_TAGS=(${ADDITIONAL_TAG})
diff --git a/.github/workflows/publish-helm.yml b/.github/workflows/publish-helm.yml
index 22b2e62cdf..1e8835acb5 100644
--- a/.github/workflows/publish-helm.yml
+++ b/.github/workflows/publish-helm.yml
@@ -95,7 +95,7 @@ jobs:
           fetch-depth: 1
           token: ${{ secrets.NGINX_PAT }}
           path: helm-charts
-        if: ${{ inputs.nginx_helm_repo == 'true' }}
+        if: ${{ inputs.nginx_helm_repo }}
 
       - name: Push Helm Chart to Helm Charts Repository
         run: |
@@ -106,4 +106,4 @@ jobs:
           git -c user.name='NGINX Kubernetes Team' -c user.email='kubernetes@nginx.com' \
           commit -m "NGINX Ingress Controller - Release ${{ inputs.chart_version }}"
           git push -u origin master
-        if: ${{ inputs.nginx_helm_repo == 'true' }}
+        if: ${{ inputs.nginx_helm_repo }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index efd5b52149..5385fbd48a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -245,8 +245,8 @@ jobs:
               workflow_id: 'build-cnab.yml',
               ref: 'main',
               inputs: {
-                chart_version: '${{ inputs.chart_version }}'
-                ic_version: '${{ inputs.nic_version }}'
+                chart_version: '${{ inputs.chart_version }}',
+                ic_version: '${{ inputs.nic_version }}',
                 cnab_version: '${{ inputs.cnab_version }}'
               },
             })
@@ -417,7 +417,7 @@ jobs:
           milestone_number=$(gh api \
             -H "Accept: application/vnd.github.v3+json" \
             /repos/${{ github.repository }}/milestones \
-            | jq --arg version ${{ inputs.nic_version }} -r \
+            | jq --arg version "v${{ inputs.nic_version }}" -r \
             '.[] | select(.title == $version) | .number')
           if [ -n "${milestone_number}" ]; then
             if ! ${{ inputs.dry_run }}; then