diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index bba30b0..0000000
--- a/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-.github
-SampleProject
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3fab343..2bef456 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Build and load into Docker
       uses: docker/build-push-action@v5
       with:
-        context: .
+        context: ./docker
         load: true
         tags: ${{ env.TEST_TAG }}
     - name: Test
@@ -49,7 +49,7 @@ jobs:
       if: ${{ env.RELEASING }}
       uses: docker/build-push-action@v5
       with:
-        context: .
+        context: ./docker
         push: ${{ env.RELEASING }}
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from Dockerfile
rename to docker/Dockerfile
diff --git a/configure-wine b/docker/configure-wine
similarity index 100%
rename from configure-wine
rename to docker/configure-wine
diff --git a/opt/bin/wine-run b/docker/opt/bin/wine-run
similarity index 100%
rename from opt/bin/wine-run
rename to docker/opt/bin/wine-run
diff --git a/opt/bin/wine-session b/docker/opt/bin/wine-session
similarity index 100%
rename from opt/bin/wine-session
rename to docker/opt/bin/wine-session
diff --git a/opt/bin/x11-headless b/docker/opt/bin/x11-headless
similarity index 100%
rename from opt/bin/x11-headless
rename to docker/opt/bin/x11-headless