diff --git a/run b/run
index c7d7feb6e7d2670d4e8d185766fdfd116b0a151c..73443ff5f8a129fc1e43ee115992e67c30768c2f 100755
--- a/run
+++ b/run
@@ -5,8 +5,8 @@
 main() {
   # Try to read the gitlab-workhorse host:port from the environments
   if [ "x${host}" = x ]; then
-    # Try a hostname file
-    host="$(cat hostname 2>/dev/null)"
+    # Try a host/hostname file
+    host="$(cat host 2>/dev/null || cat hostname 2>/dev/null)"
   fi
   if [ "x${port}" = x ]; then
     # Try a port file