diff --git a/charts/internal-gateway/Chart.yaml b/charts/internal-gateway/Chart.yaml
index 6ee767b..c6cab6c 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.6.0
+version: 0.7.0
 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 e48a590..1960f64 100644
--- a/charts/internal-gateway/README.md
+++ b/charts/internal-gateway/README.md
@@ -1,6 +1,6 @@
 # internal-gateway
 
-![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
+![Version: 0.7.0](https://img.shields.io/badge/Version-0.6.0-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
 
diff --git a/charts/internal-gateway/templates/_default_values.tpl b/charts/internal-gateway/templates/_default_values.tpl
index ef3f248..c86af24 100644
--- a/charts/internal-gateway/templates/_default_values.tpl
+++ b/charts/internal-gateway/templates/_default_values.tpl
@@ -1,6 +1,9 @@
 {{- define "internal-gateway.default-values" }}
 codefresh:
   serviceEndpoints:
+    cfapi-auth:
+      svc: '{{ .Release.Name }}-{{ index .Values.codefresh "cfapi-auth-svc" }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}'
+      port: {{ index .Values.codefresh "cfapi-auth-port" }}
     cfapi-endpoints:
       svc: '{{ .Release.Name }}-{{ index .Values.codefresh "cfapi-endpoints-svc" }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}'
       port: {{ index .Values.codefresh "cfapi-endpoints-port" }}
diff --git a/charts/internal-gateway/templates/_location_map.tpl b/charts/internal-gateway/templates/_location_map.tpl
index 45cb85b..8f21547 100644
--- a/charts/internal-gateway/templates/_location_map.tpl
+++ b/charts/internal-gateway/templates/_location_map.tpl
@@ -114,8 +114,8 @@ nginx:
       /api/auth/authenticate:
         enabled: true
         proxy:
-          host: {{ index $endpoints.serviceEndpoints "cfapi-endpoints" "svc" }}
-          port: {{ index $endpoints.serviceEndpoints "cfapi-endpoints" "port" }}
+          host: {{ index $endpoints.serviceEndpoints "cfapi-auth" "svc" }}
+          port: {{ index $endpoints.serviceEndpoints "cfapi-auth" "port" }}
           proxyPassSnippet: |
             proxy_pass_request_body off;
         locationSnippet: |
@@ -130,6 +130,16 @@ nginx:
         locationDirectives:
           {{- $presets.locationDirectives | toYaml | nindent 10 }}
 
+      /api/auth/:
+        enabled: true
+        proxy:
+          host: {{ index $endpoints.serviceEndpoints "cfapi-auth" "svc" }}
+          port: {{ index $endpoints.serviceEndpoints "cfapi-auth" "port" }}
+        locationSnippet:
+          {{- $presets.locationSnippet | toYaml | nindent 10 }}
+        locationDirectives:
+          {{- $presets.locationDirectives | toYaml | nindent 10 }}
+
       /api/:
         enabled: true
         proxy:
diff --git a/charts/internal-gateway/values.yaml b/charts/internal-gateway/values.yaml
index eada08b..503da2d 100644
--- a/charts/internal-gateway/values.yaml
+++ b/charts/internal-gateway/values.yaml
@@ -6,6 +6,9 @@ libraryMode: true
 # List of services endpoints and port
 # @default -- See below
 codefresh:
+  cfapi-auth-svc: cfapi-auth
+  cfapi-auth-port: 80
+
   cfapi-endpoints-svc: cfapi-endpoints
   cfapi-endpoints-port: 80