diff --git a/Dockerfile b/Dockerfile
index d792c126b95d02729d8e22b1c1eadbad06498be1..81c4c0b6a71e5d45e53e660ed0b506735349dd87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,4 +43,6 @@ RUN set -e \
 # Start Service
 EXPOSE 8008
 ENTRYPOINT ["make"]
-CMD ["run.gunicorn"]
+# Uncomment when this is done: https://gitlab.servus.at/aura/engine-api/-/issues/36
+# CMD ["run.gunicorn"]
+CMD ["run"]
diff --git a/Makefile b/Makefile
index 91cd4ee1018929a871a47d3977bc24c3e81b5b0e..edf13ce551c2cf958a68825201102e0131448d0e 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ DOCKER_RUN = @docker run \
 init.app:: pyproject.toml
 	poetry install
 	cp -n config/sample.engine-api.ini config/engine-api.ini
-	cp -n config/sample/gunicorn/sample-production.gunicorn.conf.py config/gunicorn.conf.py
+	cp -n config/sample/gunicorn/sample.gunicorn.conf.py config/gunicorn.conf.py
 
 init.dev:: pyproject.toml
 	poetry install --with dev