diff --git a/README.md b/README.md
index da0e95af32..0a62fdd902 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ In the case of NGINX, the Ingress Controller is deployed in a pod along with the
 We publish NGINX Ingress Controller releases on GitHub. See our [releases
 page](https://github.com/nginxinc/kubernetes-ingress/releases).
 
-The latest stable release is [3.6.1](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v3.6.1). For production
+The latest stable release is [3.6.2](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v3.6.2). For production
 use, we recommend that you choose the latest stable release.
 
 The edge version is useful for experimenting with new features that are not yet published in a stable release. To use
@@ -140,7 +140,7 @@ your links to the correct versions:
 
 | Version | Description |  Image for NGINX | Image for NGINX Plus | Installation Manifests and Helm Chart | Documentation and Examples |
 | ------- | ----------- | --------------- | -------------------- | ---------------------------------------| -------------------------- |
-| Latest stable release | For production use | Use the 3.6.1 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | Use the 3.6.1 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-nginx-ingress-controller/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.1/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.1/charts/nginx-ingress). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
+| Latest stable release | For production use | Use the 3.6.2 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | Use the 3.6.2 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-nginx-ingress-controller/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.2/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.2/charts/nginx-ingress). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
 | Edge/Nightly | For testing and experimenting | Use the edge or nightly images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-nginx-ingress-controller/). | [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-nginx-ingress-controller/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/main/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/main/charts/nginx-ingress). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples). |
 
 ## SBOM (Software Bill of Materials)
diff --git a/charts/nginx-ingress/Chart.yaml b/charts/nginx-ingress/Chart.yaml
index 92e30ca70d..c33fe3fde6 100644
--- a/charts/nginx-ingress/Chart.yaml
+++ b/charts/nginx-ingress/Chart.yaml
@@ -5,10 +5,10 @@ appVersion: 3.7.0
 kubeVersion: ">= 1.23.0-0"
 type: application
 description: NGINX Ingress Controller
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.1/charts/nginx-ingress/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.2/charts/nginx-ingress/chart-icon.png
 home: https://github.com/nginxinc/kubernetes-ingress
 sources:
-  - https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.1/charts/nginx-ingress
+  - https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.2/charts/nginx-ingress
 keywords:
   - ingress
   - nginx
diff --git a/charts/nginx-ingress/values-icp.yaml b/charts/nginx-ingress/values-icp.yaml
index 2776a79517..9a1aee170a 100644
--- a/charts/nginx-ingress/values-icp.yaml
+++ b/charts/nginx-ingress/values-icp.yaml
@@ -4,7 +4,7 @@ controller:
   nginxplus: true
   image:
     repository: mycluster.icp:8500/kube-system/nginx-plus-ingress
-    tag: "3.6.1"
+    tag: "3.6.2"
   nodeSelector:
     beta.kubernetes.io/arch: "amd64"
     proxy: true
diff --git a/charts/nginx-ingress/values-plus.yaml b/charts/nginx-ingress/values-plus.yaml
index 7eee8953b2..77a799a5f5 100644
--- a/charts/nginx-ingress/values-plus.yaml
+++ b/charts/nginx-ingress/values-plus.yaml
@@ -3,4 +3,4 @@ controller:
   nginxplus: true
   image:
     repository: nginx-plus-ingress
-    tag: "3.6.1"
+    tag: "3.6.2"
diff --git a/charts/nginx-ingress/values.schema.json b/charts/nginx-ingress/values.schema.json
index 1a2d7b2920..30264314e4 100644
--- a/charts/nginx-ingress/values.schema.json
+++ b/charts/nginx-ingress/values.schema.json
@@ -540,10 +540,10 @@
             },
             "tag": {
               "type": "string",
-              "default": "3.6.1",
+              "default": "3.6.2",
               "title": "The tag of the Ingress Controller image",
               "examples": [
-                "3.6.1"
+                "3.6.2"
               ]
             },
             "digest": {
@@ -580,7 +580,7 @@
           "examples": [
             {
               "repository": "nginx/nginx-ingress",
-              "tag": "3.6.1",
+              "tag": "3.6.2",
               "pullPolicy": "IfNotPresent"
             }
           ]
@@ -1662,7 +1662,7 @@
           "customPorts": [],
           "image": {
             "repository": "nginx/nginx-ingress",
-            "tag": "3.6.1",
+            "tag": "3.6.2",
             "digest": "",
             "pullPolicy": "IfNotPresent"
           },
@@ -2202,7 +2202,7 @@
         "customPorts": [],
         "image": {
           "repository": "nginx/nginx-ingress",
-          "tag": "3.6.1",
+          "tag": "3.6.2",
           "digest": "",
           "pullPolicy": "IfNotPresent"
         },
diff --git a/charts/nginx-ingress/values.yaml b/charts/nginx-ingress/values.yaml
index b77f670eae..002102bfb1 100644
--- a/charts/nginx-ingress/values.yaml
+++ b/charts/nginx-ingress/values.yaml
@@ -134,7 +134,7 @@ controller:
     repository: nginx/nginx-ingress
 
     ## The tag of the Ingress Controller image. If not specified the appVersion from Chart.yaml is used as a tag.
-    # tag: "3.6.1"
+    # tag: "3.6.2"
     ## The digest of the Ingress Controller image.
     ## If digest is specified it has precedence over tag and will be used instead
     # digest: "sha256:CHANGEME"
diff --git a/deployments/daemon-set/nginx-ingress.yaml b/deployments/daemon-set/nginx-ingress.yaml
index 64b0aa7423..13fb51ac08 100644
--- a/deployments/daemon-set/nginx-ingress.yaml
+++ b/deployments/daemon-set/nginx-ingress.yaml
@@ -32,7 +32,7 @@ spec:
 #      - name: nginx-log
 #        emptyDir: {}
       containers:
-      - image: nginx/nginx-ingress:3.6.1
+      - image: nginx/nginx-ingress:3.6.2
         imagePullPolicy: IfNotPresent
         name: nginx-ingress
         ports:
@@ -95,7 +95,7 @@ spec:
          #- -enable-prometheus-metrics
          #- -global-configuration=$(POD_NAMESPACE)/nginx-configuration
 #      initContainers:
-#      - image: nginx/nginx-ingress:3.6.1
+#      - image: nginx/nginx-ingress:3.6.2
 #        imagePullPolicy: IfNotPresent
 #        name: init-nginx-ingress
 #        command: ['cp', '-vdR', '/etc/nginx/.', '/mnt/etc']
diff --git a/deployments/daemon-set/nginx-plus-ingress.yaml b/deployments/daemon-set/nginx-plus-ingress.yaml
index 203c80c4b9..acf919f556 100644
--- a/deployments/daemon-set/nginx-plus-ingress.yaml
+++ b/deployments/daemon-set/nginx-plus-ingress.yaml
@@ -32,7 +32,7 @@ spec:
 #      - name: nginx-log
 #        emptyDir: {}
       containers:
-      - image: nginx-plus-ingress:3.6.1
+      - image: nginx-plus-ingress:3.6.2
         imagePullPolicy: IfNotPresent
         name: nginx-plus-ingress
         ports:
@@ -98,7 +98,7 @@ spec:
          #- -enable-prometheus-metrics
          #- -global-configuration=$(POD_NAMESPACE)/nginx-configuration
 #      initContainers:
-#      - image: nginx/nginx-ingress:3.6.1
+#      - image: nginx/nginx-ingress:3.6.2
 #        imagePullPolicy: IfNotPresent
 #        name: init-nginx-ingress
 #        command: ['cp', '-vdR', '/etc/nginx/.', '/mnt/etc']
diff --git a/deployments/deployment/nginx-ingress.yaml b/deployments/deployment/nginx-ingress.yaml
index c842e73365..02840489a4 100644
--- a/deployments/deployment/nginx-ingress.yaml
+++ b/deployments/deployment/nginx-ingress.yaml
@@ -33,7 +33,7 @@ spec:
 #      - name: nginx-log
 #        emptyDir: {}
       containers:
-      - image: nginx/nginx-ingress:3.6.1
+      - image: nginx/nginx-ingress:3.6.2
         imagePullPolicy: IfNotPresent
         name: nginx-ingress
         ports:
@@ -96,7 +96,7 @@ spec:
          #- -enable-prometheus-metrics
          #- -global-configuration=$(POD_NAMESPACE)/nginx-configuration
 #      initContainers:
-#      - image: nginx/nginx-ingress:3.6.1
+#      - image: nginx/nginx-ingress:3.6.2
 #        imagePullPolicy: IfNotPresent
 #        name: init-nginx-ingress
 #        command: ['cp', '-vdR', '/etc/nginx/.', '/mnt/etc']
diff --git a/deployments/deployment/nginx-plus-ingress.yaml b/deployments/deployment/nginx-plus-ingress.yaml
index acde218301..c749f80f1c 100644
--- a/deployments/deployment/nginx-plus-ingress.yaml
+++ b/deployments/deployment/nginx-plus-ingress.yaml
@@ -33,7 +33,7 @@ spec:
 #      - name: nginx-log
 #        emptyDir: {}
       containers:
-      - image: nginx-plus-ingress:3.6.1
+      - image: nginx-plus-ingress:3.6.2
         imagePullPolicy: IfNotPresent
         name: nginx-plus-ingress
         ports:
@@ -102,7 +102,7 @@ spec:
          #- -enable-service-insight
          #- -global-configuration=$(POD_NAMESPACE)/nginx-configuration
 #      initContainers:
-#      - image: nginx/nginx-ingress:3.6.1
+#      - image: nginx/nginx-ingress:3.6.2
 #        imagePullPolicy: IfNotPresent
 #        name: init-nginx-ingress
 #        command: ['cp', '-vdR', '/etc/nginx/.', '/mnt/etc']
diff --git a/docs/content/releases.md b/docs/content/releases.md
index 4fb0500445..94e6d54b94 100644
--- a/docs/content/releases.md
+++ b/docs/content/releases.md
@@ -6,6 +6,37 @@ doctypes:
 title: Releases
 toc: true
 weight: 2100
+---
+## 3.6.2
+
+19 Aug 2024
+
+### <i class="fa-solid fa-bug-slash"></i> Fixes
+- [6125](https://github.com/nginxinc/kubernetes-ingress/pull/6125) Don't log errors for not implemented grpc metrics
+- [6223](https://github.com/nginxinc/kubernetes-ingress/pull/6223) Re-order mounting debian apt source file
+
+### <i class="fa-solid fa-upload"></i> Dependencies
+- [5974](https://github.com/nginxinc/kubernetes-ingress/pull/5974), [6021](https://github.com/nginxinc/kubernetes-ingress/pull/6021), [5998](https://github.com/nginxinc/kubernetes-ingress/pull/5998), [6081](https://github.com/nginxinc/kubernetes-ingress/pull/6081), [6120](https://github.com/nginxinc/kubernetes-ingress/pull/6120), [6141](https://github.com/nginxinc/kubernetes-ingress/pull/6141), [6196](https://github.com/nginxinc/kubernetes-ingress/pull/6196), [6204](https://github.com/nginxinc/kubernetes-ingress/pull/6204), [6211](https://github.com/nginxinc/kubernetes-ingress/pull/6211), [6222](https://github.com/nginxinc/kubernetes-ingress/pull/6204) & [6234](https://github.com/nginxinc/kubernetes-ingress/pull/6234) Go dependencies
+- [5967](https://github.com/nginxinc/kubernetes-ingress/pull/5967), [6013](https://github.com/nginxinc/kubernetes-ingress/pull/6013), [6070](https://github.com/nginxinc/kubernetes-ingress/pull/6070), [6098](https://github.com/nginxinc/kubernetes-ingress/pull/6098), [6126](https://github.com/nginxinc/kubernetes-ingress/pull/6126), [6158](https://github.com/nginxinc/kubernetes-ingress/pull/6158), [6179](https://github.com/nginxinc/kubernetes-ingress/pull/6179), [6191](https://github.com/nginxinc/kubernetes-ingress/pull/6191), [6226](https://github.com/nginxinc/kubernetes-ingress/pull/6226) & [6233](https://github.com/nginxinc/kubernetes-ingress/pull/6233) Docker base image updates
+
+### <i class="fa-solid fa-download"></i> Upgrade
+
+- For NGINX, use the 3.6.2 images from our
+[DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name=3.6.2),
+[GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress),
+[Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress).
+- For NGINX Plus, use the 3.6.2 images from the F5 Container registry,
+the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE),
+the [GCP Marketplace](https://console.cloud.google.com/marketplace/browse?filter=partner:F5,%20Inc.&filter=solution-type:k8s&filter=category:networking)
+or build your own image using the 3.6.2 source code
+- For Helm, use version 1.3.2 of the chart.
+
+### <i class="fa-solid fa-life-ring"></i> Supported Platforms
+
+We will provide technical support for NGINX Ingress Controller on any Kubernetes platform that is currently supported by
+its provider and that passes the Kubernetes conformance tests. This release was fully tested on the following Kubernetes
+versions: 1.26-1.31.
+
 ---
 {{< note >}} 
 FIPS compliant images are currently impacted by compatibility issues with a dependent library.
diff --git a/docs/content/technical-specifications.md b/docs/content/technical-specifications.md
index a51742f099..c212f7b564 100644
--- a/docs/content/technical-specifications.md
+++ b/docs/content/technical-specifications.md
@@ -28,7 +28,7 @@ We test NGINX Ingress Controller on a range of Kubernetes platforms for each rel
 {{< bootstrap-table "table table-bordered table-striped table-responsive" >}}
 | NIC Version | Supported Kubernetes Version | NIC Helm Chart Version | NIC Operator Version | NGINX / NGINX Plus version |
 | --- | --- | --- | --- | --- |
-| {{< nic-version >}} | 1.25 - 1.30 | {{< nic-helm-version >}} | {{< nic-operator-version >}} | 1.27.1 / R32 |
+| {{< nic-version >}} | 1.26 - 1.31 | {{< nic-helm-version >}} | {{< nic-operator-version >}} | 1.27.1 / R32 |
 | 3.5.2 | 1.23 - 1.30 | 1.2.2 | 2.2.2 | 1.27.0 / R32 |
 | 3.4.3 | 1.23 - 1.29 | 1.1.3 | 2.1.2 | 1.25.4 / R31 P1 |
 | 3.3.2 | 1.22 - 1.28 | 1.0.2 | 2.0.2 | 1.25.3 / R30 |
@@ -133,6 +133,7 @@ NGINX Plus images are available through the Microsoft Azure Marketplace.
 |<div style="width:200px">Name</div> | <div style="width:100px">Base image</div> | <div style="width:200px">Third-party modules</div> | Azure Marketplace Link | Architectures |
 | ---| ---| --- | --- | --- |
 |Debian-based image | ``debian:12-slim`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | [F5 NGINX Ingress Controller](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/nginxinc.nginx_ingress_premium) | amd64 |
+|Debian-based image with NGINX App Protect WAF | ``debian:12-slim`` | NGINX App Protect WAF<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | [F5 NGINX Ingress Controller w/ F5 NGINX App Protect WAF](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/nginxinc.nginx_ingress_premium_waf) | amd64 |
 {{% /bootstrap-table %}}
 
 ---
diff --git a/docs/layouts/shortcodes/nic-helm-version.html b/docs/layouts/shortcodes/nic-helm-version.html
index 6261a05bb0..d5e98f723f 100644
--- a/docs/layouts/shortcodes/nic-helm-version.html
+++ b/docs/layouts/shortcodes/nic-helm-version.html
@@ -1 +1 @@
-1.3.1
\ No newline at end of file
+1.3.2
\ No newline at end of file
diff --git a/docs/layouts/shortcodes/nic-operator-version.html b/docs/layouts/shortcodes/nic-operator-version.html
index a6254504e4..e7034819f6 100644
--- a/docs/layouts/shortcodes/nic-operator-version.html
+++ b/docs/layouts/shortcodes/nic-operator-version.html
@@ -1 +1 @@
-2.3.1
\ No newline at end of file
+2.3.2
\ No newline at end of file
diff --git a/docs/layouts/shortcodes/nic-version.html b/docs/layouts/shortcodes/nic-version.html
index d1428a7e96..77a069e39b 100644
--- a/docs/layouts/shortcodes/nic-version.html
+++ b/docs/layouts/shortcodes/nic-version.html
@@ -1 +1 @@
-3.6.1
\ No newline at end of file
+3.6.2
\ No newline at end of file
diff --git a/examples/custom-resources/service-insight/README.md b/examples/custom-resources/service-insight/README.md
index 5e8b6dc952..401b9e3a05 100644
--- a/examples/custom-resources/service-insight/README.md
+++ b/examples/custom-resources/service-insight/README.md
@@ -32,7 +32,7 @@ spec:
       securityContext:
       ...
       containers:
-      - image: nginx-plus-ingress:3.6.1
+      - image: nginx-plus-ingress:3.6.2
         imagePullPolicy: IfNotPresent
         name: nginx-plus-ingress
         ports:
@@ -321,7 +321,7 @@ spec:
       securityContext:
       ...
       containers:
-      - image: nginx-plus-ingress:3.6.1
+      - image: nginx-plus-ingress:3.6.2
         imagePullPolicy: IfNotPresent
         name: nginx-plus-ingress
         ports: