diff --git a/charts/internal-gateway/Chart.yaml b/charts/internal-gateway/Chart.yaml
index 383c6eb..2c023d2 100644
--- a/charts/internal-gateway/Chart.yaml
+++ b/charts/internal-gateway/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.0.0
 description: A Helm chart for Codefresh Internal Gateway
 name: internal-gateway
-version: 0.12.1
+version: 0.12.2
 home: https://github.com/codefresh-io/helm-charts
 keywords:
   - codefresh
diff --git a/charts/internal-gateway/README.md b/charts/internal-gateway/README.md
index 847c94f..13238ea 100644
--- a/charts/internal-gateway/README.md
+++ b/charts/internal-gateway/README.md
@@ -1,6 +1,6 @@
 # internal-gateway
 
-![Version: 0.12.1](https://img.shields.io/badge/Version-0.12.1-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
+![Version: 0.12.2](https://img.shields.io/badge/Version-0.12.2-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
 
 A Helm chart for Codefresh Internal Gateway
 
@@ -33,6 +33,7 @@ A Helm chart for Codefresh Internal Gateway
 | global.dnsService | string | `"kube-dns"` | configures DNS service name |
 | hpa | object | See below | HPA parameters |
 | ingress | object | See below | Ingress parameters |
+| ipv6 | object | `{"enabled":true}` | Enable IPv6 support |
 | keda.enabled | bool | `false` |  |
 | libraryMode | bool | `false` |  |
 | nginx.config.accessLogEnabled | bool | `true` | Enables NGINX access logs |
diff --git a/charts/internal-gateway/templates/_components/_configmap.tpl b/charts/internal-gateway/templates/_components/_configmap.tpl
index 03ee1d5..81032e6 100644
--- a/charts/internal-gateway/templates/_components/_configmap.tpl
+++ b/charts/internal-gateway/templates/_components/_configmap.tpl
@@ -85,7 +85,9 @@ data:
 
       server {
         listen 8080;
+        {{- if .Values.ipv6.enabled }}
         listen [::]:8080;
+        {{- end }}
 
         {{- range $key, $val := $nginxConfig.serverDirectives }}
         {{ printf "%s %s;" $key $val }}
diff --git a/charts/internal-gateway/values.yaml b/charts/internal-gateway/values.yaml
index 419a0a4..28fc3b2 100644
--- a/charts/internal-gateway/values.yaml
+++ b/charts/internal-gateway/values.yaml
@@ -2,6 +2,10 @@
 # Added to support usage in Codefresh On-Premise Helm chart
 libraryMode: false
 
+# -- Enable IPv6 support
+ipv6:
+  enabled: true
+
 # -- Codefresh platform settings
 # List of services endpoints and port
 # @default -- See below