diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93b49f2a2170407f9c227b4dcf57df39b2e85101..4890155651d6758bc5777e3df76fb044a5d00f6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [5.0.3](https://gitlab.com/to-be-continuous/docker/compare/5.0.2...5.0.3) (2023-05-17)
+
+
+### Bug Fixes
+
+* derive buildah cache from snapshot image ([63016e6](https://gitlab.com/to-be-continuous/docker/commit/63016e61044bf96ba5f1ff239b5e4db6ac2e5b92))
+
 ## [5.0.2](https://gitlab.com/to-be-continuous/docker/compare/5.0.1...5.0.2) (2023-05-16)
 
 
diff --git a/README.md b/README.md
index e0665bf2fbc2a047cafaff915a3dd8e803573ff9..8b90368104020986420d87515583af91eb93f94e 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ In order to include this template in your project, add the following to your `.g
 ```yaml
 include:
   - project: 'to-be-continuous/docker'
-    ref: '5.0.2'
+    ref: '5.0.3'
     file: '/templates/gitlab-ci-docker.yml'
 ```
 
@@ -473,7 +473,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry:
 ```yaml
 include:
   - project: 'to-be-continuous/docker'
-    ref: '5.0.2'
+    ref: '5.0.3'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -491,7 +491,7 @@ Here is a `.gitlab-ci.yaml` that builds 2 Docker images from the same project (u
 ```yaml
 include:
   - project: 'to-be-continuous/docker'
-    ref: '5.0.2'
+    ref: '5.0.3'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -548,11 +548,11 @@ With:
 include:
   # main template
   - project: 'to-be-continuous/docker'
-    ref: '5.0.2'
+    ref: '5.0.3'
     file: '/templates/gitlab-ci-docker.yml'
   # Vault variant
   - project: 'to-be-continuous/docker'
-    ref: '5.0.2'
+    ref: '5.0.3'
     file: '/templates/gitlab-ci-docker-vault.yml'
 
 variables:
diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml
index 9a3b30a9a35a059633dd64a21c5ca4a056d02bf0..67c95ea53cae6bcffd773f6f09f654a1ac7b41b9 100644
--- a/templates/gitlab-ci-docker-vault.yml
+++ b/templates/gitlab-ci-docker-vault.yml
@@ -11,6 +11,6 @@ variables:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.0.2"]
+      command: ["--service", "docker", "5.0.3"]
     - name: "$TBC_VAULT_IMAGE"
       alias: "vault-secrets-provider"
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index ef0f08a1daa7a495a032cf8125d168816c2b7c3f..7656c822fd8ef1e48b1e0514d81fea99f842029f 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -432,7 +432,7 @@ stages:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.0.2"]
+      command: ["--service", "docker", "5.0.3"]
   before_script:
     - *docker-scripts
 
@@ -462,7 +462,7 @@ stages:
     _TRACE: "${TRACE}"
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.0.2"]
+      command: ["--service", "docker", "5.0.3"]
     - name: $DOCKER_DIND_IMAGE
       alias: docker
       command: