diff --git a/Dockerfile b/Dockerfile
index 7ea49ae..6ffd879 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,7 +41,7 @@ RUN mkdir /perkeep/data && \
     mkdir /perkeep/config
 
 COPY --chown=$USER:$GROUP --chmod=750 --from=builder /go/bin/* /usr/local/bin/
-COPY --chown=$USER:$GROUP --chmod=750 server-config.tpl.json /perkeep/config/server-config-custom.tpl.json
+COPY --chown=$USER:$GROUP --chmod=750 server-config.tpl.json /perkeep/server-config-custom.tpl.json
 COPY --chown=$USER:$GROUP --chmod=750 docker-entrypoint.sh /docker-entrypoint.sh
 
 VOLUME /perkeep/data
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 36d5aa7..489e75a 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -8,7 +8,7 @@ fi
 if [ "T$SECRING" != "T" ] && [ "T$IDENTITY" != "T" ];
 then
   echo "$SECRING" > /perkeep/config/identity-secring.gpg
-  envsubst < /perkeep/config/server-config-custom.tpl.json > /perkeep/config/server-config-custom.json
+  envsubst < /perkeep/server-config-custom.tpl.json > /perkeep/config/server-config-custom.json
 fi
 
 if [ ! -f /perkeep/config/identity-secring.gpg  ];
@@ -16,7 +16,7 @@ then
   pk put init -newkey
   mv perkeep/.config/perkeep/identity-secring.gpg /perkeep/config/
   export IDENTITY=$(sed -n -e '/identity/ s/.*:.*"\(.*\)".*/\1/p' /perkeep/.config/perkeep/client-config.json | tee /dev/tty)
-  envsubst < /perkeep/config/server-config-custom.tpl.json > /perkeep/config/server-config-custom.json
+  envsubst < /perkeep/server-config-custom.tpl.json > /perkeep/config/server-config-custom.json
   rm -r /perkeep/.config
 fi