diff --git a/content/includes/nic/compatibility-tables/nic-nap.md b/content/includes/nic/compatibility-tables/nic-nap.md
index 1646cac4a..e40c6b79d 100644
--- a/content/includes/nic/compatibility-tables/nic-nap.md
+++ b/content/includes/nic/compatibility-tables/nic-nap.md
@@ -3,7 +3,7 @@ The following table shows compatibility between NGINX Ingress Controller (NIC) a
 {{< bootstrap-table "table table-striped table-responsive" >}}
 | NIC Version         | NAP-WAF Version | Config Manager | Enforcer |
 | ------------------- | --------------- | -------------- | -------- |
-| {{< nic-version >}} | 35+5.527        | 5.9.0          | 5.9.0    |
+| {{< nic-version >}} | 35+{{< appprotect-compiler-version>}}       | {{< nic-waf-release-version >}}          | {{< nic-waf-release-version >}}   |
 | 5.1.1               | 35+5.498        | 5.8.0          | 5.8.0    |
 | 5.0.0               | 34+5.342        | 5.6.0          | 5.6.0    |
 | 4.0.1               | 33+5.264        | 5.5.0          | 5.5.0    |
diff --git a/content/nic/installation/installing-nic/deploy-with-nap-using-helm.md b/content/nic/installation/installing-nic/deploy-with-nap-using-helm.md
index 231bc2e2c..f60f3f70f 100644
--- a/content/nic/installation/installing-nic/deploy-with-nap-using-helm.md
+++ b/content/nic/installation/installing-nic/deploy-with-nap-using-helm.md
@@ -44,7 +44,7 @@ This is accomplished with the following steps:
 Pull the `waf-compiler` image with:
 
 ```shell
-docker pull private-registry.nginx.com/nap/waf-compiler:5.9.0
+docker pull private-registry.nginx.com/nap/waf-compiler:{{<nic-waf-release-version>}}
 ```
 
 Download the [provided WAF Policy JSON](https://raw.githubusercontent.com/nginx/kubernetes-ingress/main/tests/data/ap-waf-v5/wafv5.json):
@@ -53,13 +53,13 @@ Download the [provided WAF Policy JSON](https://raw.githubusercontent.com/nginx/
 curl -L https://raw.githubusercontent.com/nginx/kubernetes-ingress/main/tests/data/ap-waf-v5/wafv5.json -o /tmp/wafv5.json
 ```
 
-Use your pulled NAP Docker image (`private-registry.nginx.com/nap/waf-compiler:5.9.0`) to compile the policy bundle:
+Use your pulled NAP Docker image (`private-registry.nginx.com/nap/waf-compiler:{{<nic-waf-release-version>}}`) to compile the policy bundle:
 
 ```shell
 # Using your newly created image
 docker run --rm \
     -v /tmp:/tmp \
-    private-registry.nginx.com/nap/waf-compiler:5.9.0 \
+    private-registry.nginx.com/nap/waf-compiler:{{<nic-waf-release-version>}} \
     -p /tmp/wafv5.json \
     -o /tmp/compiled_policy.tgz
 ```
diff --git a/layouts/shortcodes/nic-waf-release-version.html b/layouts/shortcodes/nic-waf-release-version.html
new file mode 100644
index 000000000..cf5136119
--- /dev/null
+++ b/layouts/shortcodes/nic-waf-release-version.html
@@ -0,0 +1 @@
+5.9.0
\ No newline at end of file