diff --git a/roles/installer/tasks/database_configuration.yml b/roles/installer/tasks/database_configuration.yml
index 470530ae..2e99be55 100644
--- a/roles/installer/tasks/database_configuration.yml
+++ b/roles/installer/tasks/database_configuration.yml
@@ -80,9 +80,8 @@
 - block:
     - name: Create Database if no database is specified
       k8s:
-        apply: yes
+        apply: true
         definition: "{{ lookup('template', 'postgres.yaml.j2') }}"
-        wait: yes
       register: create_statefulset_result
 
   rescue:
diff --git a/roles/installer/templates/postgres.yaml.j2 b/roles/installer/templates/postgres.yaml.j2
index f87c8420..d17ee12a 100644
--- a/roles/installer/templates/postgres.yaml.j2
+++ b/roles/installer/templates/postgres.yaml.j2
@@ -37,27 +37,10 @@ spec:
       imagePullSecrets:
         - name: {{ image_pull_secret }}
 {% endif %}
-      initContainers:
-        - name: init-chmod-data
-          image: '{{ postgres_image }}:{{ postgres_image_version }}'
-          imagePullPolicy: '{{ image_pull_policy }}'
-          command:
-            - /bin/sh
-            - -c
-            - |
-              if [ ! -f {{ postgres_data_path }}/PG_VERSION ]; then
-                chown postgres:root {{ postgres_data_path | dirname }}
-              fi
-          volumeMounts:
-            - name: postgres
-              mountPath: '{{ postgres_data_path | dirname }}'
-              subPath: '{{ postgres_data_path | dirname | basename }}'
       containers:
         - image: '{{ postgres_image }}:{{ postgres_image_version }}'
           imagePullPolicy: '{{ image_pull_policy }}'
           name: postgres
-          securityContext:
-            fsGroup: 999
           env:
             # For postgres_image based on rhel8/postgresql-12
             - name: POSTGRESQL_DATABASE