diff --git a/lib/App/Netdisco/Configuration.pm b/lib/App/Netdisco/Configuration.pm
index 7ddb50e8..758d5c32 100644
--- a/lib/App/Netdisco/Configuration.pm
+++ b/lib/App/Netdisco/Configuration.pm
@@ -25,18 +25,16 @@ if (ref {} eq ref setting('database')) {
       ($ENV{NETDISCO_DB_NAME} || $ENV{NETDISCO_DBNAME} || setting('database')->{name});
 
     setting('database')->{host} =
-      ($ENV{NETDISCO_DB_HOST} || $ENV{DB_PORT_5432_TCP_ADDR} || setting('database')->{host});
+      ($ENV{NETDISCO_DB_HOST} || setting('database')->{host});
 
-    setting('database')->{host} .=
-      (';'. ($ENV{NETDISCO_DB_PORT} || $ENV{DB_PORT_5432_TCP_PORT}))
-      if (setting('database')->{host} and
-          ($ENV{NETDISCO_DB_PORT} || $ENV{DB_PORT_5432_TCP_PORT}));
+    setting('database')->{host} .= (';'. $ENV{NETDISCO_DB_PORT})
+      if (setting('database')->{host} and $ENV{NETDISCO_DB_PORT});
 
     setting('database')->{user} =
-      ($ENV{NETDISCO_DB_USER} || $ENV{DB_ENV_POSTGRES_USER} || setting('database')->{user});
+      ($ENV{NETDISCO_DB_USER} || setting('database')->{user});
 
     setting('database')->{pass} =
-      ($ENV{NETDISCO_DB_PASS} || $ENV{DB_ENV_POSTGRES_PASSWORD} || setting('database')->{pass});
+      ($ENV{NETDISCO_DB_PASS} || setting('database')->{pass});
 
     my $name = setting('database')->{name};
     my $host = setting('database')->{host};