diff --git a/config/runtime.exs b/config/runtime.exs
index 9e96da1..c9b510f 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -38,19 +38,9 @@ if config_env() == :prod do
     pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10"),
     socket_options: maybe_ipv6
 
-  pg_host = System.get_env("PG_HOST") || System.get_env("PG_host")
-  pg_port = System.get_env("PG_PORT") || System.get_env("PG_port", "5432")
-  pg_user = System.get_env("PG_USER") || System.get_env("PG_username")
-  pg_password = System.get_env("PG_PASSWORD") || System.get_env("PG_password")
-  pg_database = System.get_env("PG_DATABASE") || System.get_env("PG_dbname")
-
   config :policy_service, PolicyService.EventStore,
     serializer: Commanded.Serialization.JsonSerializer,
-    username: pg_user || raise("PG_USER or PG_username is required"),
-    password: pg_password || raise("PG_PASSWORD or PG_password is required"),
-    database: pg_database || raise("PG_DATABASE or PG_dbname is required"),
-    hostname: pg_host || raise("PG_HOST or PG_host is required"),
-    port: String.to_integer(pg_port || "5432"),
+    url: database_url,
     pool_size: 5
 
   secret_key_base =
diff --git a/ops/chart/values.yaml b/ops/chart/values.yaml
index a2c550c..6056cd6 100644
--- a/ops/chart/values.yaml
+++ b/ops/chart/values.yaml
@@ -34,10 +34,6 @@ controllers:
               secretKeyRef:
                 name: policy-service-pg-app
                 key: uri
-        envFrom:
-          - secretRef:
-              name: policy-service-pg-app
-              prefix: PG_
         probes:
           liveness:
             enabled: true