diff --git a/charts/identity-service/Chart.lock b/charts/identity-service/Chart.lock
index 7c7dc50..a1c88fe 100644
--- a/charts/identity-service/Chart.lock
+++ b/charts/identity-service/Chart.lock
@@ -8,8 +8,8 @@ dependencies:
 - name: identity-api
   repository: ""
   version: 1.0.1
-- name: identity-api-gatekeeper
-  repository: ""
-  version: 1.0.1
-digest: sha256:f5835b39ba8985d01dcbea7b0033bef8b4c6a0f841669db14df609fea45cd638
-generated: "2024-01-10T11:25:10.571713758Z"
+- name: identity-gatekeeper
+  repository: https://eoepca.github.io/helm-charts/
+  version: 1.0.3
+digest: sha256:df13cf989e22af19f08c6905e4727c0f8f77a181bf53ec122e889eb6c630a80b
+generated: "2024-01-10T15:36:03.889019903Z"
diff --git a/charts/identity-service/Chart.yaml b/charts/identity-service/Chart.yaml
index 04c9ab0..ac3cc4a 100644
--- a/charts/identity-service/Chart.yaml
+++ b/charts/identity-service/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.84
+version: 1.0.85
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -33,6 +33,8 @@ dependencies:
   - name: identity-api
     condition: identity-api.enabled
     version: 1.0.1
-  - name: identity-api-gatekeeper
-    condition: identity-api-gatekeeper.enabled
-    version: 1.0.1
+  - name: identity-gatekeeper
+    condition: identity-gatekeeper.enabled
+    version: 1.0.3
+    repository: "https://eoepca.github.io/helm-charts/"
+    alias: identity-api-gatekeeper
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/.helmignore b/charts/identity-service/charts/identity-api-gatekeeper/.helmignore
deleted file mode 100644
index 0e8a0eb..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/Chart.yaml b/charts/identity-service/charts/identity-api-gatekeeper/Chart.yaml
deleted file mode 100644
index c3c1f16..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/Chart.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: v2
-name: identity-api-gatekeeper
-description: Policy enforcement integration with Keycloak for identity-api
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "2.8.0"
\ No newline at end of file
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/templates/_helpers.tpl b/charts/identity-service/charts/identity-api-gatekeeper/templates/_helpers.tpl
deleted file mode 100644
index c299048..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/templates/_helpers.tpl
+++ /dev/null
@@ -1,82 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "identity-api-gatekeeper.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "identity-api-gatekeeper.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "identity-api-gatekeeper.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "identity-api-gatekeeper.labels" -}}
-helm.sh/chart: {{ include "identity-api-gatekeeper.chart" . }}
-{{ include "identity-api-gatekeeper.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Values.deployment.image.tag | default .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "identity-api-gatekeeper.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "identity-api-gatekeeper.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "identity-api-gatekeeper.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "identity-api-gatekeeper.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{/*
-Return the appropriate apiVersion for ingress
-*/}}
-{{- define "identity-api-gatekeeper.ingress.apiVersion" -}}
-{{- if semverCompare "<1.14-0" (include "identity-api-gatekeeper.kubeVersion" $) -}}
-{{- print "extensions/v1beta1" -}}
-{{- else if semverCompare "<1.19-0" (include "identity-api-gatekeeper.kubeVersion" $) -}}
-{{- print "networking.k8s.io/v1beta1" -}}
-{{- else -}}
-{{- print "networking.k8s.io/v1" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the target Kubernetes version
-*/}}
-{{- define "identity-api-gatekeeper.kubeVersion" -}}
-  {{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride }}
-{{- end -}}
\ No newline at end of file
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/templates/configmap.yaml b/charts/identity-service/charts/identity-api-gatekeeper/templates/configmap.yaml
deleted file mode 100644
index 3d8f851..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/templates/configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "identity-api-gatekeeper.fullname" . }}
-  labels:
-    {{- include "identity-api-gatekeeper.labels" . | nindent 4 }}
-  namespace: {{ .Release.Namespace }}
-data:
-  config.yaml: |
-    {{- tpl (.Values.config | toYaml) $ | nindent 4 }}
\ No newline at end of file
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/templates/deployment.yaml b/charts/identity-service/charts/identity-api-gatekeeper/templates/deployment.yaml
deleted file mode 100644
index 08e9188..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/templates/deployment.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-{{- $adminPort := regexFind ":[0-9]+" (index .Values.config "listen-admin") | trimPrefix ":" -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "identity-api-gatekeeper.name" . }}
-  labels:
-    {{- include "identity-api-gatekeeper.labels" . | nindent 4 }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.deployment.replicaCount }}
-  {{- end }}
-  strategy:
-    {{- toYaml .Values.deployment.strategy | nindent 4 }}
-  selector:
-    matchLabels:
-        {{- include "identity-api-gatekeeper.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      annotations:
-        checksum/config: {{ print .Values.config | sha256sum | quote }}
-        {{- if and (index .Values.config "enable-metrics") .Values.metrics.addPrometheusScrapeAnnotation }}
-        prometheus.io/path: "/oauth/metrics"
-        prometheus.io/port: {{ $adminPort | quote }}
-        prometheus.io/scrape: "true"
-        {{- end }}
-        {{- with .Values.deployment.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      labels:
-        {{- include "identity-api-gatekeeper.selectorLabels" . | nindent 8 }}
-        {{- range $key, $value := .Values.deployment.podLabels }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
-    spec:
-      {{- with .Values.deployment.image.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      automountServiceAccountToken: {{ .Values.deployment.automountServiceAccountToken }}
-      serviceAccountName: {{ include "identity-api-gatekeeper.serviceAccountName" . }}
-      {{- if .Values.deployment.podSecurityContext.enabled }}
-      securityContext:
-        {{- omit .Values.deployment.podSecurityContext "enabled" | toYaml | nindent 8 }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          {{- if .Values.deployment.containerSecurityContext.enabled }}
-          securityContext:
-            {{- omit .Values.deployment.containerSecurityContext "enabled" | toYaml | nindent 12 }}
-          {{- end }}
-          image: "{{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.deployment.image.pullPolicy }}
-          args:
-            - --config
-            - /etc/gatekeeper/config.yaml
-            {{- with .Values.deployment.extraArgs }}
-            {{- toYaml . | nindent 12 }}
-            {{- end }}
-          {{- with .Values.deployment.extraEnvVars }}
-          env:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          envFrom:
-            {{- with .Values.deployment.extraEnvFrom }}
-            {{- tpl . $ | nindent 12 }}
-            {{- end }}
-            - secretRef:
-                name: {{ include "identity-api-gatekeeper.name" . }}
-          ports:
-            - name: proxy
-              containerPort: {{ regexFind ":[0-9]+" .Values.config.listen | trimPrefix ":" }}
-              protocol: TCP
-            - name: admin
-              containerPort: {{ $adminPort }}
-              protocol: TCP
-          {{- if .Values.deployment.livenessProbe.enabled }}
-          livenessProbe:
-            {{- omit .Values.deployment.livenessProbe "enabled" | toYaml | nindent 12 }}
-          {{- end }}
-          {{- if .Values.deployment.readinessProbe.enabled }}
-          readinessProbe:
-            {{- omit .Values.deployment.readinessProbe "enabled" | toYaml | nindent 12 }}
-          {{- end }}
-          resources:
-            {{- toYaml .Values.deployment.resources | nindent 12 }}
-          volumeMounts:
-            - mountPath: /etc/gatekeeper
-              name: config
-            {{- with .Values.deployment.extraVolumeMounts }}
-            {{- toYaml . | nindent 12 }}
-            {{- end }}
-      volumes:
-        - configMap:
-            name: {{ include "identity-api-gatekeeper.fullname" . }}
-          name: config
-        {{- with .Values.deployment.extraVolumes }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      {{- with .Values.deployment.priorityClassName }}
-      priorityClassName: {{ . | quote }}
-      {{- end }}
-      {{- with .Values.deployment.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.deployment.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.deployment.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if .Values.deployment.hostAliases }}
-      hostAliases: {{ toYaml .Values.deployment.hostAliases | nindent 8 }}
-      {{- end }}
\ No newline at end of file
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/templates/hpa.yaml b/charts/identity-service/charts/identity-api-gatekeeper/templates/hpa.yaml
deleted file mode 100644
index 3e334ed..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/templates/hpa.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-{{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "identity-api-gatekeeper.fullname" . }}
-  labels:
-    {{- include "identity-api-gatekeeper.labels" . | nindent 4 }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "identity-api-gatekeeper.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/templates/ingress.yaml b/charts/identity-service/charts/identity-api-gatekeeper/templates/ingress.yaml
deleted file mode 100644
index 652731d..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/templates/ingress.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $name := include "identity-api-gatekeeper.name" . -}}
-{{- $svcPort := .Values.service.proxy.port -}}
-apiVersion: {{ include "identity-api-gatekeeper.ingress.apiVersion" . }}
-kind: Ingress
-metadata:
-  name: {{ $name }}
-  labels:
-    {{- include "identity-api-gatekeeper.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" (include "identity-api-gatekeeper.kubeVersion" $)) }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if and .pathType (semverCompare ">=1.18-0" (include "identity-api-gatekeeper.kubeVersion" $)) }}
-            pathType: {{ .pathType }}
-            {{- end }}
-            backend:
-              {{- if semverCompare ">=1.19-0" (include "identity-api-gatekeeper.kubeVersion" $) }}
-              service:
-                name: {{ $name }}
-                port:
-                  number: {{ $svcPort }}
-              {{- else }}
-              serviceName: {{ $name }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/templates/pdb.yaml b/charts/identity-service/charts/identity-api-gatekeeper/templates/pdb.yaml
deleted file mode 100644
index 9b94574..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/templates/pdb.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-{{- if .Values.pdb.create }}
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  name: {{ include "identity-api-gatekeeper.fullname" . }}
-  labels:
-    {{- include "identity-api-gatekeeper.labels" . | nindent 4 }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  minAvailable: {{ .Values.pdb.minAvailable }}
-  selector:
-    matchLabels:
-      {{- include "identity-api-gatekeeper.selectorLabels" . | nindent 6 }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/templates/secret.yaml b/charts/identity-service/charts/identity-api-gatekeeper/templates/secret.yaml
deleted file mode 100644
index b12efc5..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/templates/secret.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- if and (.Values.secrets.clientSecret) (.Values.secrets.encryptionKey) -}}
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: {{ include "identity-api-gatekeeper.name" . }}
-  labels:
-    {{- include "identity-api-gatekeeper.labels" . | nindent 4 }}
-  namespace: {{ .Release.Namespace }}
-data:
-  PROXY_CLIENT_SECRET: "{{ .Values.secrets.clientSecret }}"
-  PROXY_ENCRYPTION_KEY: "{{ .Values.secrets.encryptionKey }}"
-{{- end }}
\ No newline at end of file
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/templates/service.yaml b/charts/identity-service/charts/identity-api-gatekeeper/templates/service.yaml
deleted file mode 100644
index e879ccb..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/templates/service.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "identity-api-gatekeeper.name" . }}
-  labels:
-    {{- include "identity-api-gatekeeper.labels" . | nindent 4 }}
-  {{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.proxy.port }}
-      targetPort: proxy
-      protocol: TCP
-      name: proxy
-      {{- if eq .Values.service.type "NodePort" }}
-      nodePort: {{ .Values.service.proxy.nodePort }}
-      {{- end }}
-    - port: {{ .Values.service.admin.port }}
-      targetPort: admin
-      protocol: TCP
-      name: admin
-      {{- if eq .Values.service.type "NodePort" }}
-      nodePort: {{ .Values.service.admin.nodePort }}
-      {{- end }}
-  selector:
-    {{- include "identity-api-gatekeeper.selectorLabels" . | nindent 4 }}
\ No newline at end of file
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/templates/serviceaccount.yaml b/charts/identity-service/charts/identity-api-gatekeeper/templates/serviceaccount.yaml
deleted file mode 100644
index c5e34d6..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "identity-api-gatekeeper.serviceAccountName" . }}
-  labels:
-    {{- include "identity-api-gatekeeper.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  namespace: {{ .Release.Namespace }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/templates/servicemonitor.yaml b/charts/identity-service/charts/identity-api-gatekeeper/templates/servicemonitor.yaml
deleted file mode 100644
index 9e1d2ec..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/templates/servicemonitor.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{- if and (index .Values.config "enable-metrics") .Values.metrics.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ include "identity-api-gatekeeper.fullname" . }}
-  {{- with .Values.metrics.serviceMonitor.namespace }}
-  namespace: {{ . }}
-  {{- end }}
-  labels:
-    {{- include "identity-api-gatekeeper.labels" . | nindent 4 }}
-    {{- with .Values.metrics.serviceMonitor.additionalLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  endpoints:
-    - port: admin
-      {{- with .Values.metrics.serviceMonitor.interval }}
-      interval: {{ . }}
-      {{- end }}
-      path: /oauth/metrics
-  namespaceSelector:
-    matchNames:
-      - {{ .Release.Namespace }}
-  selector:
-    matchLabels:
-      {{- include "identity-api-gatekeeper.selectorLabels" . | nindent 6 }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/identity-service/charts/identity-api-gatekeeper/values.yaml b/charts/identity-service/charts/identity-api-gatekeeper/values.yaml
deleted file mode 100644
index a7f6390..0000000
--- a/charts/identity-service/charts/identity-api-gatekeeper/values.yaml
+++ /dev/null
@@ -1,134 +0,0 @@
-nameOverride: ""
-fullnameOverride: ""
-kubeVersionOverride: ""
-deployment:
-  replicaCount: 1
-  image:
-    pullPolicy: IfNotPresent
-  strategy:
-    type: Recreate
-    # rollingUpdate:
-    #   maxSurge: 25%
-    #   maxUnavailable: 25%
-  automountServiceAccountToken: false
-  podAnnotations: {}
-  podLabels: {}
-  podSecurityContext:
-    enabled: false
-    # fsGroup: 2000
-  containerSecurityContext:
-    enabled: true
-    capabilities:
-      drop:
-        - ALL
-    readOnlyRootFilesystem: true
-    runAsNonRoot: true
-    # runAsUser: 1000
-  extraArgs: []
-  # - --foo
-  # - --bar
-  extraEnvVars: []
-  # - name: FOO
-  #   value: BAR
-  extraVolumes: []
-  # - emptyDir: {}
-  #   name: tmp
-  extraVolumeMounts: []
-  # - mountPath: /tmp
-  #   name: tmp
-  priorityClassName: ""
-  hostAliases: []
-  # - ip: "127.0.0.1"
-  #   hostnames:
-  #   - "foo.local"
-  #   - "bar.local"
-  # - ip: "10.1.2.3"
-  #   hostnames:
-  #   - "foo.remote"
-  #   - "bar.remote"
-  resources:
-    limits: {}
-    #   cpu: 100m
-    #   memory: 128Mi
-    requests: {}
-    #   cpu: 100m
-    #   memory: 128Mi
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-  livenessProbe:
-    enabled: false
-    httpGet:
-      path: /oauth/health
-      port: admin
-  readinessProbe:
-    enabled: true
-    httpGet:
-      path: /oauth/health
-      port: admin
-service:
-  type: ClusterIP
-  annotations: {}
-  proxy:
-    port: 3000
-    nodePort:
-  admin:
-    port: 4000
-    nodePort:
-serviceAccount:
-  create: true
-  annotations: {}
-  name: ""
-ingress:
-  enabled: true
-  className: ""
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-  hosts:
-    - host: identity.api-gatekeeper.myplatform.eoepca.org
-      paths:
-        - path: /
-          pathType: Prefix
-  tls:
-    - secretName: identity-api-gatekeeper-tls-certificate
-      hosts:
-        - identity.gatekeeper.myplatform.eoepca.org
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 3
-  targetCPUUtilizationPercentage: 80
-  #targetMemoryUtilizationPercentage: 80
-pdb:
-  create: false
-  minAvailable: 1
-metrics:
-  addPrometheusScrapeAnnotation: false
-  serviceMonitor:
-    enabled: false
-    namespace: um
-    additionalLabels: {}
-    annotations: {}
-    interval:
-config:
-  client-id: identity-api
-  discovery-url: https://identity.keycloak.myplatform.eoepca.org/realms/master
-  no-redirects: true
-  no-proxy: true
-  enable-uma: true
-  #enable-default-deny: true
-  cookie-domain: myplatform.eoepca.org
-  cookie-access-name: auth_user_id
-  cookie-refresh-name: auth_refresh_token
-  #secure-cookie: true
-  enable-metrics: true
-  enable-logging: true
-  enable-request-id: true
-  enable-login-handler: true
-  enable-refresh-tokens: true
-  enable-logout-redirect: true
-  listen: :3000
-  listen-admin: :4000
-secrets:
-  clientSecret: ""
-  encryptionKey: ""
diff --git a/charts/identity-service/values.yaml b/charts/identity-service/values.yaml
index 5730650..3bcafed 100644
--- a/charts/identity-service/values.yaml
+++ b/charts/identity-service/values.yaml
@@ -18,7 +18,3 @@ identity-api:
       pullPolicy: IfNotPresent
 identity-api-gatekeeper:
   enabled: true
-  deployment:
-    image:
-      repository: quay.io/gogatekeeper/gatekeeper
-      pullPolicy: IfNotPresent