diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97e7f2f507599450d68884eecb605e3af3ac1c36..f47d55c0f13f6a6c330850305d511fd0597bb5a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [5.8.2](https://gitlab.com/to-be-continuous/docker/compare/5.8.1...5.8.2) (2024-03-21)
+
+
+### Bug Fixes
+
+* keep default dependencies on jobs using DOCKER_SNAPSHOT_IMAGE or DOCKER_RELEASE_IMAGE ([bb974c2](https://gitlab.com/to-be-continuous/docker/commit/bb974c288dc1a45dd89782f5de4ef7a928a3ffd5))
+
 ## [5.8.1](https://gitlab.com/to-be-continuous/docker/compare/5.8.0...5.8.1) (2024-1-28)
 
 
diff --git a/README.md b/README.md
index 5bfaa93aa3a87975e9fb7f87f9452abf27427bad..17b60aac2112307ba7cf2f21380905a74227189b 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Add the following to your `gitlab-ci.yml`:
 ```yaml
 include:
   # 1: include the component
-  - component: gitlab.com/to-be-continuous/docker/gitlab-ci-docker@5.8.1
+  - component: gitlab.com/to-be-continuous/docker/gitlab-ci-docker@5.8.2
     # 2: set/override component inputs
     inputs:
       build-tool: buildah # ⚠ this is only an example
@@ -28,7 +28,7 @@ Add the following to your `gitlab-ci.yml`:
 include:
   # 1: include the template
   - project: 'to-be-continuous/docker'
-    ref: '5.8.1'
+    ref: '5.8.2'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml
index 9d7a0d7f64526898f479fbe74760533550083499..f7c70227c84c89d906a901a9770243ecf8efe4ab 100644
--- a/templates/gitlab-ci-docker-ecr.yml
+++ b/templates/gitlab-ci-docker-ecr.yml
@@ -45,7 +45,7 @@ variables:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.8.1"]
+      command: ["--service", "docker", "5.8.2"]
     - name: "$TBC_AWS_PROVIDER_IMAGE"
       alias: "aws-auth-provider"
   id_tokens:
diff --git a/templates/gitlab-ci-docker-gcp.yml b/templates/gitlab-ci-docker-gcp.yml
index af47ab2127f01376f1ead94dd28d53552a2e2e2b..1453b009598471446a70ab76fe7bb0231e1fea4c 100644
--- a/templates/gitlab-ci-docker-gcp.yml
+++ b/templates/gitlab-ci-docker-gcp.yml
@@ -44,7 +44,7 @@ variables:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.8.1"]
+      command: ["--service", "docker", "5.8.2"]
     - name: "$TBC_GCP_PROVIDER_IMAGE"
       alias: "gcp-auth-provider"
   variables:
diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml
index 856d53acba34f4b4494449af4cfa30e0ddf2a249..17598e91eb6b0552313e842d213dcb9fb0d48439 100644
--- a/templates/gitlab-ci-docker-vault.yml
+++ b/templates/gitlab-ci-docker-vault.yml
@@ -22,7 +22,7 @@ variables:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.8.1"]
+      command: ["--service", "docker", "5.8.2"]
     - name: "$TBC_VAULT_IMAGE"
       alias: "vault-secrets-provider"
   variables:
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index 8c8f0e1af6179f673cc8dc0a3b539135cf118ef6..e4808479677c48a8f64a704a553650eca443781d 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -653,7 +653,7 @@ stages:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.8.1"]
+      command: ["--service", "docker", "5.8.2"]
   before_script:
     - !reference [.docker-scripts]
 
@@ -686,7 +686,7 @@ stages:
     _TRACE: "${TRACE}"
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.8.1"]
+      command: ["--service", "docker", "5.8.2"]
     - name: $DOCKER_DIND_IMAGE
       alias: docker
       command: