diff --git a/apps/auth-db/src/main/fabric8/deployment.yml b/apps/auth-db/src/main/fabric8/deployment.yml
index 209330a3..8c1288c4 100644
--- a/apps/auth-db/src/main/fabric8/deployment.yml
+++ b/apps/auth-db/src/main/fabric8/deployment.yml
@@ -16,7 +16,6 @@ spec:
         image: registry.centos.org/postgresql/postgresql:9.6
         imagePullPolicy: IfNotPresent
         env:
-        env:
         - name: POSTGRESQL_ADMIN_PASSWORD
           valueFrom:
             secretKeyRef:
@@ -48,10 +47,10 @@ spec:
         - containerPort: 5432
           protocol: TCP
         volumeMounts:
-        - mountPath: /var/lib/pgsql
+        - mountPath: /var/lib/pgsql/data
           name: auth-db-postgresql-data
           readOnly: false
       volumes:
       - name: auth-db-postgresql-data
         persistentVolumeClaim:
-          claimName: auth-db-postgresql-data
\ No newline at end of file
+          claimName: auth-db-postgresql-data
diff --git a/apps/gitea-db/src/main/fabric8/deployment.yml b/apps/gitea-db/src/main/fabric8/deployment.yml
index e14160e9..b9e04ac6 100644
--- a/apps/gitea-db/src/main/fabric8/deployment.yml
+++ b/apps/gitea-db/src/main/fabric8/deployment.yml
@@ -48,10 +48,10 @@ spec:
         - containerPort: 5432
           protocol: TCP
         volumeMounts:
-        - mountPath: /var/lib/pgsql
+        - mountPath: /var/lib/pgsql/data
           name: gitea-db-postgresql-data
           readOnly: false
       volumes:
       - name: gitea-db-postgresql-data
         persistentVolumeClaim:
-          claimName: gitea-db-postgresql-data
\ No newline at end of file
+          claimName: gitea-db-postgresql-data
diff --git a/apps/init-tenant/src/main/fabric8/db-deployment.yml b/apps/init-tenant/src/main/fabric8/db-deployment.yml
index ceca0e9d..9c18f79d 100644
--- a/apps/init-tenant/src/main/fabric8/db-deployment.yml
+++ b/apps/init-tenant/src/main/fabric8/db-deployment.yml
@@ -49,10 +49,10 @@ spec:
         - containerPort: 5432
           protocol: TCP
         volumeMounts:
-        - mountPath: /var/lib/pgsql
+        - mountPath: /var/lib/pgsql/data
           name: init-tenant-postgresql-data
           readOnly: false
       volumes:
       - name: init-tenant-postgresql-data
         persistentVolumeClaim:
-          claimName: init-tenant-postgresql-data
\ No newline at end of file
+          claimName: init-tenant-postgresql-data
diff --git a/apps/mattermost-db/src/main/fabric8/deployment.yml b/apps/mattermost-db/src/main/fabric8/deployment.yml
index de93b4fd..1e738e90 100644
--- a/apps/mattermost-db/src/main/fabric8/deployment.yml
+++ b/apps/mattermost-db/src/main/fabric8/deployment.yml
@@ -48,10 +48,10 @@ spec:
         - containerPort: 5432
           protocol: TCP
         volumeMounts:
-        - mountPath: /var/lib/pgsql
+        - mountPath: /var/lib/pgsql/data
           name: mattermost-db-postgresql-data
           readOnly: false
       volumes:
       - name: mattermost-db-postgresql-data
         persistentVolumeClaim:
-          claimName: mattermost-db-postgresql-data
\ No newline at end of file
+          claimName: mattermost-db-postgresql-data
diff --git a/apps/wit/src/main/fabric8/db-deployment.yml b/apps/wit/src/main/fabric8/db-deployment.yml
index 6cc97775..2b1ecf38 100644
--- a/apps/wit/src/main/fabric8/db-deployment.yml
+++ b/apps/wit/src/main/fabric8/db-deployment.yml
@@ -49,10 +49,10 @@ spec:
         - containerPort: 5432
           protocol: TCP
         volumeMounts:
-        - mountPath: /var/lib/pgsql
+        - mountPath: /var/lib/pgsql/data
           name: wit-postgresql-data
           readOnly: false
       volumes:
       - name: wit-postgresql-data
         persistentVolumeClaim:
-          claimName: wit-postgresql-data
\ No newline at end of file
+          claimName: wit-postgresql-data