diff --git a/charts/nmaas/Chart.yaml b/charts/nmaas/Chart.yaml
index de5f32d968276fa299a5a30265e85aed181e29e4..1629e629ef76e958999e19c67064fabe7a7d84b9 100644
--- a/charts/nmaas/Chart.yaml
+++ b/charts/nmaas/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: nmaas
 description: GÉANT Network Management as a Service Helm chart for Kubernetes
-version: 2.0.2-alpha.2
+version: 2.0.2-alpha.3
 appVersion: 1.8.0
 keywords:
   - Network Management
diff --git a/charts/nmaas/templates/nmaas-platform-deployment.yaml b/charts/nmaas/templates/nmaas-platform-deployment.yaml
index 5e0a77aa2db7b7bd984c89f47746631a8501d63a..d186bd109b322704230aabd345158daeda5e0c02 100644
--- a/charts/nmaas/templates/nmaas-platform-deployment.yaml
+++ b/charts/nmaas/templates/nmaas-platform-deployment.yaml
@@ -207,6 +207,7 @@ spec:
             value: {{ .Values.platform.properties.autoNamespaceCreationForDomains | quote }}
           - name: PORTAL_SSO_ALLOWED_FLAG
             value: {{ .Values.platform.properties.oidc.enabled | quote }}
+          {{- if .Values.properties.oidc.enabled }}
           - name: OIDC_CLIENT_ID
             value: {{ .Values.platform.properties.oidc.clientId | quote }}
           - name: OIDC_ISSUER_URI
@@ -220,6 +221,7 @@ spec:
               secretKeyRef:
                 name: {{ .Values.platform.properties.oidc.secretName }}
                 key: {{ .Values.platform.properties.oidc.clientSecret.secret.key }}
+          {{- end }}
           - name: JWT_SIGNING_KEY
             valueFrom:
               secretKeyRef: