diff --git a/.dockerignore b/.dockerignore
index 8fbd66a..6e5d305 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
+/.git
 /.buildx-cache
 /.github
 /example-app
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 0a684c7..83ab67b 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -50,8 +50,8 @@ jobs:
           tags: "croneu/phpapp-fpm:php-${{ matrix.php-version }}"
           platforms: ${{ env.PLATFORMS }}
           push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=php-${{ matrix.php-version }}-${{ env.PLATFORMS }}
+          cache-to: type=gha,mode=max,scope=php-${{ matrix.php-version }}-${{ env.PLATFORMS }}
           target: php-fpm
           build-args: |
             PHP_MINOR_VERSION=${{ matrix.php-version }}
@@ -111,8 +111,8 @@ jobs:
           tags: "croneu/phpapp-ssh:php-${{ matrix.php-version }}-node-${{ matrix.node-version }}"
           platforms: ${{ env.PLATFORMS }}
           push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=php-${{ matrix.php-version }}-node-${{ matrix.node-version }}-${{ env.PLATFORMS }}
+          cache-to: type=gha,mode=max,scope=php-${{ matrix.php-version }}-node-${{ matrix.node-version }}-${{ env.PLATFORMS }}
           target: ssh
           build-args: |
             PHP_MINOR_VERSION=${{ matrix.php-version }}
diff --git a/.github/workflows/build-only.yml b/.github/workflows/build-only.yml
index 6d550e0..a421633 100644
--- a/.github/workflows/build-only.yml
+++ b/.github/workflows/build-only.yml
@@ -37,8 +37,8 @@ jobs:
           tags: "croneu/phpapp-fpm:php-${{ matrix.php-version }}"
           platforms: ${{ env.PLATFORMS }}
           push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=php-${{ matrix.php-version }}-${{ env.PLATFORMS }}
+          cache-to: type=gha,mode=max,scope=php-${{ matrix.php-version }}-${{ env.PLATFORMS }}
           target: php-fpm
           build-args: |
             PHP_MINOR_VERSION=${{ matrix.php-version }}
@@ -76,8 +76,8 @@ jobs:
           tags: "croneu/phpapp-ssh:php-${{ matrix.php-version }}-node-${{ matrix.node-version }}"
           platforms: ${{ env.PLATFORMS }}
           push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=php-${{ matrix.php-version }}-node-${{ matrix.node-version }}-${{ env.PLATFORMS }}
+          cache-to: type=gha,mode=max,scope=php-${{ matrix.php-version }}-node-${{ matrix.node-version }}-${{ env.PLATFORMS }}
           target: ssh
           build-args: |
             PHP_MINOR_VERSION=${{ matrix.php-version }}