diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec6a98ae7daeb4e736b55104f5c69c8883f9e79b..0a4ff62d774e0edf2611fb4bb8c18094eb324c71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [5.8.0](https://gitlab.com/to-be-continuous/docker/compare/5.7.1...5.8.0) (2024-1-27)
+
+
+### Features
+
+* migrate to GitLab CI/CD component ([60f2c3f](https://gitlab.com/to-be-continuous/docker/commit/60f2c3f60178a74660a4b057a054b3914cf56922))
+
 ## [5.7.1](https://gitlab.com/to-be-continuous/docker/compare/5.7.0...5.7.1) (2024-1-18)
 
 
diff --git a/README.md b/README.md
index 0c12f5ac629c9430ce02f57623df54199d14ba1c..98300b34c5905408a1427771c615086dbcf8b4ba 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Add the following to your `gitlab-ci.yml`:
 include:
   # 1: include the template
   - project: 'to-be-continuous/docker'
-    ref: '5.7.1'
+    ref: '5.8.0'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml
index 7c52540fcfe5b5f1353f5cafa5d26ef1a00a8184..92d219869a5343fd7bb8c795b040ce35f9d32f66 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.7.1"]
+      command: ["--service", "docker", "5.8.0"]
     - 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 8162d6d9bc840da701908d89e3b7189478970c3f..5986bc72b37b13a0e611b9a123550da1189c5c39 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.7.1"]
+      command: ["--service", "docker", "5.8.0"]
     - 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 3c65ee46b3d1141b1862b4769c76530bbb95b9e4..cfde3459ad98d09b0ee541049ace7704accd29e3 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.7.1"]
+      command: ["--service", "docker", "5.8.0"]
     - name: "$TBC_VAULT_IMAGE"
       alias: "vault-secrets-provider"
   variables:
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index 0fcb3b036ba24f97ae1012d2431aade2ce27587d..cad37eeb98ce8bff3e9823386f6b0ab61682ac9a 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -666,7 +666,7 @@ stages:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.7.1"]
+      command: ["--service", "docker", "5.8.0"]
   before_script:
     - !reference [.docker-scripts]
 
@@ -699,7 +699,7 @@ stages:
     _TRACE: "${TRACE}"
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.7.1"]
+      command: ["--service", "docker", "5.8.0"]
     - name: $DOCKER_DIND_IMAGE
       alias: docker
       command: