diff --git a/lib/App/Netdisco/Configuration.pm b/lib/App/Netdisco/Configuration.pm
index b6d9f378..e9d61473 100644
--- a/lib/App/Netdisco/Configuration.pm
+++ b/lib/App/Netdisco/Configuration.pm
@@ -18,6 +18,8 @@ BEGIN {
 
 # set up database schema config from simple config vars
 if (ref {} eq ref setting('database')) {
+    # override from env for docker
+
     setting('database')->{name} =
       ($ENV{NETDISCO_DB_NAME} || $ENV{NETDISCO_DBNAME} || setting('database')->{name});
 
@@ -111,6 +113,10 @@ setting('dns')->{'ETCHOSTS'} = {};
     for keys %AnyEvent::DNS::EtcHosts::HOSTS;
 }
 
+# override from env for docker
+config->{'domain_suffix'} =
+  ($ENV{NETDISCO_DOMAIN} || config->{'domain_suffix'});
+
 # support unordered dictionary as if it were a single item list
 if (ref {} eq ref setting('device_identity')) {
   config->{'device_identity'} = [ setting('device_identity') ];