diff --git a/.dockerignore b/.dockerignore
index 786311c6..02247960 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,7 @@
 .git
+**/.git
 .gitmodules
+**/.gitmodules
 .github
 .DS_Store
 .fleet
@@ -8,6 +10,13 @@
 *.log
 npm-debug.log
 yarn-error.log
+k8s
+docs
+e2e
+tests
+
+docker-compose.yml
+docker/local
 
 .phpunit.cache
 .phpunit.result.cache
@@ -16,6 +25,18 @@ test-results
 playwright-report
 blob-report
 playwright/.cache
+openapi.json
+playwright
+playwright.config.ts
+vitest.config.ts
+phpunit.xml
+phpstan.neon
+pint.json
+eslint.config.mjs
+tsconfig.json
+jsconfig.json
+postcss.config.js
+tailwind.config.js
 
 node_modules
 extensions/*/node_modules
@@ -30,3 +51,4 @@ _ide_helper.php
 .phpstorm.meta.php
 
 storage/logs/*
+storage/*.key
diff --git a/.github/workflows/build-onpremise.yml b/.github/workflows/build-onpremise.yml
index 3972a4b3..1524e5c9 100644
--- a/.github/workflows/build-onpremise.yml
+++ b/.github/workflows/build-onpremise.yml
@@ -8,6 +8,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/build-onpremise.yml'
+      - '.dockerignore'
       - 'extensions/manifest.json'
       - 'docker/prod/**'
   workflow_dispatch:
diff --git a/.github/workflows/build-private.yml b/.github/workflows/build-private.yml
index 57b8e6e8..cdbe6097 100644
--- a/.github/workflows/build-private.yml
+++ b/.github/workflows/build-private.yml
@@ -8,6 +8,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/build-private.yml'
+      - '.dockerignore'
       - 'extensions/manifest.json'
       - 'docker/prod/**'
   workflow_dispatch:
diff --git a/.github/workflows/build-public.yml b/.github/workflows/build-public.yml
index e0420055..b22d9f61 100644
--- a/.github/workflows/build-public.yml
+++ b/.github/workflows/build-public.yml
@@ -8,6 +8,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/build-public.yml'
+      - '.dockerignore'
       - 'docker/prod/**'
   workflow_dispatch:
 
diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 677c9f89..77eddb52 100644
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -189,7 +189,9 @@ ENV WITH_HORIZON=false \
     WITH_SCHEDULER=false \
     WITH_REVERB=false
 
-COPY --link --chown=${WWWUSER}:${WWWUSER} . .
+COPY --link --chown=${WWWUSER}:${WWWUSER} . ./
+
+RUN test -z "$(find . -name .git -print -quit)"
 #COPY --link --chown=${WWWUSER}:${WWWUSER} --from=build ${ROOT}/public public
 
 RUN mkdir -p \