diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index af12a47e..0f622331 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -38,8 +38,8 @@ jobs:
           cd MoviePilot-Frontend
           yarn && yarn build
           cd ..
-          mkdir -p /public
-          cp -rf ./MoviePilot-Frontend/dist/* /public/
+          mkdir -p public
+          cp -rf ./MoviePilot-Frontend/dist/* ./public/
           rm -rf MoviePilot-Frontend
           chmod +x start.sh
 
diff --git a/Dockerfile b/Dockerfile
index d09890ed..82f95c3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,6 +42,7 @@ RUN apt-get update \
         bash \
     && mkdir -p /etc/nginx ${HOME} \
     && cp -f nginx.conf /etc/nginx/nginx.template.conf \
+    && mv ./public / \
     && groupadd -r moviepilot -g 911 \
     && useradd -r moviepilot -g moviepilot -d ${HOME} -s /bin/bash -u 911 \
     && pip install --upgrade pip \