diff --git a/Dockerfile b/Dockerfile
index 8a8fa394fa..0737a8e9e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,8 @@ RUN apk --no-cache add \
     tzdata
 
 COPY docker /
-COPY --from=build-env /go/src/code.vikunja.io/api/vikunja /app/vikunja/api
+COPY --from=build-env /go/src/code.vikunja.io/api/public /app/vikunja/
+COPY --from=build-env /go/src/code.vikunja.io/api/vikunja /app/vikunja/vikunja
 
 ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"]
 CMD []
diff --git a/docker/etc/services.d/vikunja/run b/docker/etc/services.d/vikunja/run
index dcc3f69f7f..7f3384b26d 100755
--- a/docker/etc/services.d/vikunja/run
+++ b/docker/etc/services.d/vikunja/run
@@ -1,2 +1,2 @@
 #!/bin/execlineb -P
-/app/vikunja/api
+/app/vikunja/vikunja