diff --git a/harbor-operator/application-extras.yml b/harbor-operator/application-extras.yml
index 04415dd..99c3fa7 100644
--- a/harbor-operator/application-extras.yml
+++ b/harbor-operator/application-extras.yml
@@ -81,9 +81,7 @@ spec:
         imagePullPolicy: Always
         env:
         - name: POSTGRES_APPUSER
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
+          value: "kspace_harbor"
         - name: POSTGRES_APP_DB
           valueFrom:
             fieldRef:
@@ -179,9 +177,9 @@ data:
       GRANT SELECT ON pg_catalog.pg_replication_slots TO exporter;
       GRANT CONNECT ON DATABASE postgres TO exporter;
 
-      CREATE DATABASE $POSTGRES_APP_DB;
-      CREATE USER $POSTGRES_APPUSER WITH PASSWORD '$POSTGRES_APPUSER_PASSWORD';
-      GRANT ALL PRIVILEGES ON $POSTGRES_APP_DB TO '$POSTGRES_APPUSER';
+      CREATE DATABASE "$POSTGRES_APP_DB";
+      CREATE USER "$POSTGRES_APPUSER" WITH PASSWORD '$POSTGRES_APPUSER_PASSWORD';
+      GRANT ALL PRIVILEGES ON database "$POSTGRES_APP_DB" TO "$POSTGRES_APPUSER";
     EOSQL
 
 
diff --git a/harbor-operator/values.yaml b/harbor-operator/values.yaml
index 1ff15a4..e9914ba 100644
--- a/harbor-operator/values.yaml
+++ b/harbor-operator/values.yaml
@@ -126,10 +126,10 @@ database:
   type: "external"
 
   external:
-    host: "172.20.43.1"
+    host: "postgres"
     port: "5432"
     username: "kspace_harbor"
-    coreDatabase: "kspace_harbor"
+    coreDatabase: "harbor-operator"
     existingSecret: "harbor-postgres-password"
     sslmode: "disable"