diff --git a/charts/keycloak-operator/Chart.yaml b/charts/keycloak-operator/Chart.yaml
index bb859c418..b51b524f7 100644
--- a/charts/keycloak-operator/Chart.yaml
+++ b/charts/keycloak-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: keycloak-operator
 description: Deploy Keycloak Operator and Keycloak
 type: application
-version: 0.2.2
+version: 0.2.3
 appVersion: "22.0.0"
 home: https://www.keycloak.org
 sources:
@@ -15,4 +15,4 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: fixed
-      description: impagePullSecret indentation
+      description: podTemplate and additionalOptions indent fix
diff --git a/charts/keycloak-operator/README.md b/charts/keycloak-operator/README.md
index 71a6e3766..fa7cdc58b 100644
--- a/charts/keycloak-operator/README.md
+++ b/charts/keycloak-operator/README.md
@@ -1,6 +1,6 @@
 # keycloak-operator
 
-![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 22.0.0](https://img.shields.io/badge/AppVersion-22.0.0-informational?style=flat-square)
+![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 22.0.0](https://img.shields.io/badge/AppVersion-22.0.0-informational?style=flat-square)
 
 Deploy Keycloak Operator and Keycloak
 
diff --git a/charts/keycloak-operator/templates/keycloak/keycloak.yaml b/charts/keycloak-operator/templates/keycloak/keycloak.yaml
index 422172fd6..20fb40c2b 100644
--- a/charts/keycloak-operator/templates/keycloak/keycloak.yaml
+++ b/charts/keycloak-operator/templates/keycloak/keycloak.yaml
@@ -53,7 +53,7 @@ spec:
   {{- with .Values.keycloak.unsupported.podTemplate }}
   unsupported:
     # You can configure pod settings that will be merged with the one configured by default by the operator.
-    podTemplate: {{ . | toYaml }}
+    podTemplate: {{ . | toYaml | nindent 6 }}
   {{- end }}
   {{- if .Values.keycloak.ingress.enabled }}
   ingress:
@@ -76,7 +76,7 @@ spec:
   imagePullSecrets: {{ . | toYaml | nindent 4 }}
   {{- end }}
   {{- with .Values.keycloak.additionalOptions }}
-  additionalOptions: {{ . | toYaml }}
+  additionalOptions: {{ . | toYaml | nindent 4 }}
   {{- end }}
   {{- if or .Values.keycloak.db.url (and .Values.keycloak.db.host .Values.keycloak.db.port .Values.keycloak.db.database ) }}
   db:
diff --git a/charts/keycloak-operator/tests/__snapshot__/default_test.yaml.snap b/charts/keycloak-operator/tests/__snapshot__/default_test.yaml.snap
index 28f852d0a..aa1269667 100644
--- a/charts/keycloak-operator/tests/__snapshot__/default_test.yaml.snap
+++ b/charts/keycloak-operator/tests/__snapshot__/default_test.yaml.snap
@@ -9,7 +9,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: keycloakcontroller-cluster-role
     rules:
       - apiGroups:
@@ -36,7 +36,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: keycloakrealmimportcontroller-cluster-role
     rules:
       - apiGroups:
@@ -63,7 +63,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: RELEASE-NAME-keycloak-operator-operator
     spec:
       replicas: 1
@@ -128,7 +128,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: keycloak-operator-role-binding
     roleRef:
       apiGroup: rbac.authorization.k8s.io
@@ -147,7 +147,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: keycloak-operator-view
     roleRef:
       apiGroup: rbac.authorization.k8s.io
@@ -166,7 +166,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: keycloakcontroller-role-binding
     roleRef:
       apiGroup: rbac.authorization.k8s.io
@@ -185,7 +185,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: keycloakrealmimportcontroller-role-binding
     roleRef:
       apiGroup: rbac.authorization.k8s.io
@@ -204,7 +204,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: keycloak-operator-role
     rules:
       - apiGroups:
@@ -267,7 +267,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: RELEASE-NAME-keycloak-operator-operator
     spec:
       ports:
@@ -290,5 +290,5 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: RELEASE-NAME-keycloak-operator
diff --git a/charts/keycloak-operator/tests/__snapshot__/operand_test.yaml.snap b/charts/keycloak-operator/tests/__snapshot__/operand_test.yaml.snap
index 0e50af1f2..811b6581d 100644
--- a/charts/keycloak-operator/tests/__snapshot__/operand_test.yaml.snap
+++ b/charts/keycloak-operator/tests/__snapshot__/operand_test.yaml.snap
@@ -7,7 +7,7 @@ should match snapshot:
         app.kubernetes.io/component: keycloak
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: keycloak
     spec:
       features:
@@ -35,7 +35,7 @@ should match snapshot:
       labels:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/version: 22.0.0
-        helm.sh/chart: keycloak-operator-0.2.2
+        helm.sh/chart: keycloak-operator-0.2.3
       name: RELEASE-NAME-keycloak-operator-test
     spec:
       keycloakCRName: keycloak