diff --git a/unit-files/s@.service b/unit-files/s@.service
index 1e8f27b4ba6dfefd7741fdbde6ac121310c9e9e1..fd4cfdd630fd06a1376c3fca25500713bb5785a2 100644
--- a/unit-files/s@.service
+++ b/unit-files/s@.service
@@ -13,6 +13,7 @@ RestartSec=10
 TimeoutStartSec=60
 TimeoutStopSec=15
 EnvironmentFile=-/system/%i/env
+Environment=HOSTNAME=%H
 WorkingDirectory=/system/%i/
 ExecStartPre=-/opt/bin/docker-compose rm -f
 ExecStart=/bin/bash -euxc "/opt/bin/docker-compose up"
diff --git a/unit-files/u@.service b/unit-files/u@.service
index 2bd6e8f95a329d96f0e05ee375949913f7f58f84..510075432af1c41511bce26ebb0cc5e3f73783a2 100644
--- a/unit-files/u@.service
+++ b/unit-files/u@.service
@@ -13,6 +13,7 @@ RestartSec=10
 TimeoutStartSec=60
 TimeoutStopSec=15
 EnvironmentFile=-/data/domains/%i/env
+Environment=HOSTNAME=%H
 WorkingDirectory=/data/domains/%i/
 ExecStartPre=-/opt/bin/docker-compose rm -f
 ExecStart=/bin/bash -euxc "VIRTUAL_HOST=%i /opt/bin/docker-compose up"