diff --git a/.github/workflows/docker-related.yaml b/.github/workflows/docker.yaml
similarity index 97%
rename from .github/workflows/docker-related.yaml
rename to .github/workflows/docker.yaml
index a2ae195..ef9682f 100644
--- a/.github/workflows/docker-related.yaml
+++ b/.github/workflows/docker.yaml
@@ -41,6 +41,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
+          file: ./docker/Dockerfile
           push: true
           tags: ${{ env.DOCKER_IMAGE }}:latest
           platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 97%
rename from Dockerfile
rename to docker/Dockerfile
index 9d45e70..c9e168e 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -81,10 +81,10 @@ HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
   CMD sh -c 'pgrep gunicorn > /dev/null && pgrep tail > /dev/null' || exit 1
 
 # Copy the basic entrypoint.sh script.
-COPY entrypoint.sh /entrypoint.sh
+COPY ./docker/entrypoint.sh /entrypoint.sh
 
 # Exposing the default WireGuard Dashboard port for web access.
 EXPOSE 10086
 WORKDIR $WGDASH
 
-ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
diff --git a/entrypoint.sh b/docker/entrypoint.sh
similarity index 100%
rename from entrypoint.sh
rename to docker/entrypoint.sh