diff --git a/push-gateway.Dockerfile b/push-gateway.Dockerfile
index 8e4142d66260a531bf93e4da1cf0459f17c7da82..e5da967866b962cb700167688260ebc41cc4a974 100644
--- a/push-gateway.Dockerfile
+++ b/push-gateway.Dockerfile
@@ -2,7 +2,7 @@ FROM matrixdotorg/sygnal
 
 RUN apt-get update && apt-get install -y gettext-base
 
-COPY sygnal.yaml.template /sygnal.yaml.template
+COPY data-push-gateway/sygnal.yaml.template /data/sygnal.yaml.template
 COPY generate-push-gateway-config.sh /generate-push-gateway-config.sh
 RUN chmod +x /generate-push-gateway-config.sh
 
diff --git a/start-push-gateway.sh b/start-push-gateway.sh
index 7b3480a31e247fc4fbbb54d7494a1c6a93af462b..3937218ad7e1cf6ea81fa29050548f81bb2e63c1 100755
--- a/start-push-gateway.sh
+++ b/start-push-gateway.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Generate the homeserver.yaml file based on environment variables
-envsubst < ./sygnal.yaml.template > ./sygnal.yaml
+envsubst < /data/sygnal.yaml.template > /data/sygnal.yaml
 
+export SYGNAL_CONF=/data/sygnal.yaml
 python -m sygnal.sygnal
\ No newline at end of file