diff --git a/database/openshift.deploy.yml b/database/openshift.deploy.yml
index 37a4e450e..9801592ec 100644
--- a/database/openshift.deploy.yml
+++ b/database/openshift.deploy.yml
@@ -238,13 +238,11 @@ objects:
                     - bash
                     - '-c'
                     - >-
-                      psql -q -d
-                      $PG_DATABASE -c 'SELECT 1'
-                failureThreshold: 5
-                initialDelaySeconds: 30
-                periodSeconds: 15
-                successThreshold: 1
-                timeoutSeconds: 1
+                      PGPASSWORD=$PG_PASSWORD psql -h localhost -U $PG_USER -d $PG_DATABASE -c 'SELECT 1'
+                initialDelaySeconds: 60
+                periodSeconds: 20
+                failureThreshold: 6
+                timeoutSeconds: 5
               resources:
                 requests:
                   cpu: ${REQUEST_CPU}
@@ -253,8 +251,11 @@ objects:
                   cpu: ${LIMIT_CPU}
                   memory: ${LIMIT_MEMORY}
               securityContext:
-                capabilities: {}
-                privileged: false
+                # capabilities: {}
+                # privileged: false
+                runAsUser: 26
+                runAsGroup: 26
+                fsGroup: 26
               terminationMessagePath: /dev/termination-log
               volumeMounts:
                 - mountPath: /pgdata
@@ -274,3 +275,6 @@ objects:
             - configMap:
                 name: ${REPO}-${ZONE}-${COMPONENT}-setupcfg
               name: ${REPO}-${ZONE}-${COMPONENT}-setupcfg
+          securityContext:
+            fsGroup: 26
+            supplementalGroups: [26]