diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f9cae9c4361997c35e25c459a1689380728dedd..31197d84a1db7351819fcc2e72edd18099c81bee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [5.0.0](https://gitlab.com/to-be-continuous/docker/compare/4.0.0...5.0.0) (2023-05-11)
+
+
+### Features
+
+* add buildah support for building images ([f8de563](https://gitlab.com/to-be-continuous/docker/commit/f8de56361f8659d8d42144b0b4f26f3bcdf769d0))
+
+
+### BREAKING CHANGES
+
+* $DOCKER_DIND_BUILD no longer supported (replaced by $`DOCKER_BUILD_TOOL`)
+
 # [4.0.0](https://gitlab.com/to-be-continuous/docker/compare/3.5.3...4.0.0) (2023-04-05)
 
 
diff --git a/README.md b/README.md
index 120d0b342a71991334df063a287ceb1167b57e93..84f1efb0ad953957816658da9647b1516ca71654 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: '4.0.0'
+    ref: '5.0.0'
     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: '4.0.0'
+    ref: '5.0.0'
     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: '4.0.0'
+    ref: '5.0.0'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -548,11 +548,11 @@ With:
 include:
   # main template
   - project: 'to-be-continuous/docker'
-    ref: '4.0.0'
+    ref: '5.0.0'
     file: '/templates/gitlab-ci-docker.yml'
   # Vault variant
   - project: 'to-be-continuous/docker'
-    ref: '4.0.0'
+    ref: '5.0.0'
     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 90d8803c8277a4cd06fa68d98f16a6af8d849e58..f987fc30aefaa7d632d6eeddd2fe549f75b298bf 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", "4.0.0"]
+      command: ["--service", "docker", "5.0.0"]
     - name: "$TBC_VAULT_IMAGE"
       alias: "vault-secrets-provider"
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index f02d3e498d9dd0f721e057981a7ad03ef9175af3..285e6d9193bd955aa85e838edd3dbaa406afb568 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -430,7 +430,7 @@ stages:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "4.0.0"]
+      command: ["--service", "docker", "5.0.0"]
   before_script:
     - *docker-scripts
 
@@ -459,7 +459,7 @@ stages:
     _TRACE: "${TRACE}"
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "4.0.0"]
+      command: ["--service", "docker", "5.0.0"]
     - name: $DOCKER_DIND_IMAGE
       alias: docker
       command: