diff --git a/Dockerfile b/Dockerfile
index 980620a24..94346edcf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,15 +54,14 @@ RUN ln -s $HOME/bin/pleroma /bin/akkoma
 RUN ln -s $HOME/bin/pleroma_ctl /bin/pleroma_ctl
 RUN ln -s $HOME/bin/pleroma_ctl /bin/akkoma_ctl
 
-RUN mkdir -p /etc/akkoma
-
 ADD docker-entrypoint.sh $HOME/docker-entrypoint.sh
 
-RUN adduser --system --home /opt/akkoma akkoma
+RUN adduser --system --home $HOME akkoma
 USER akkoma
 
+ENV AKKOMA_CONFIG_PATH=/opt/akkoma/config/config.exs
 VOLUME uploads /opt/akkoma/uploads
 VOLUME instance /opt/akkoma/instance
-VOLUME config /etc/akkoma/config.exs
+VOLUME config /opt/akkoma/config
 
 CMD ["/opt/akkoma/docker-entrypoint.sh"]
diff --git a/docker-resources/generate-instance.sh b/docker-resources/generate-instance.sh
index 63177216c..a5fc6a018 100755
--- a/docker-resources/generate-instance.sh
+++ b/docker-resources/generate-instance.sh
@@ -10,7 +10,7 @@ mkdir -p docker-setup-tmp
 docker compose run \
     --rm \
     -e "PLEROMA_CTL_RPC_DISABLED=true" \
-    -v ./docker-setup-tmp:/opt/akkoma/config/\
+    -v $(pwd)/docker-setup-tmp:/opt/akkoma/config/ \
     akkoma ./bin/pleroma_ctl instance gen --no-sql-user --no-db-creation --dbhost db --dbname akkoma --dbuser akkoma --dbpass akkoma --listen-ip 0.0.0.0 --listen-port 4000 --static-dir /opt/akkoma/instance/ --uploads-dir /opt/akkoma/uploads/ --db-configurable true
 
 echo ""