diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c673fbb951e91f1069d88d832e887c961919d69..ddb1499280a7c247b10d1a8adbef1287eeb8513d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [3.5.1](https://gitlab.com/to-be-continuous/docker/compare/3.5.0...3.5.1) (2023-01-04)
+
+
+### Bug Fixes
+
+* wrong $docker_image_digest if GitLab registry host has a port ([c121756](https://gitlab.com/to-be-continuous/docker/commit/c121756cbf6e24d9890d11720c0a8b43a5fbb902))
+
 # [3.5.0](https://gitlab.com/to-be-continuous/docker/compare/3.4.0...3.5.0) (2022-12-13)
 
 
diff --git a/README.md b/README.md
index 6479e052d929aafd0cb6964346e9f358bb721cd5..cfa317d1999ada8e4c525f33d81fc71998d196d3 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: '3.5.0'
+    ref: '3.5.1'
     file: '/templates/gitlab-ci-docker.yml'
 ```
 
@@ -469,7 +469,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry:
 ```yaml
 include:
   - project: 'to-be-continuous/docker'
-    ref: '3.5.0'
+    ref: '3.5.1'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -487,7 +487,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: '3.5.0'
+    ref: '3.5.1'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -544,11 +544,11 @@ With:
 include:
   # main template
   - project: 'to-be-continuous/docker'
-    ref: '3.5.0'
+    ref: '3.5.1'
     file: '/templates/gitlab-ci-docker.yml'
   # Vault variant
   - project: 'to-be-continuous/docker'
-    ref: '3.5.0'
+    ref: '3.5.1'
     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 e2c7b971e1a9c680eefa65dfd21404897584ad2f..f277ffbe6a2ef0cf5e3f0e8cde5b8eb3c558ca1a 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", "3.5.0"]
+      command: ["--service", "docker", "3.5.1"]
     - name: "$TBC_VAULT_IMAGE"
       alias: "vault-secrets-provider"
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index f19d6cb4fd9629661248a8e38247fbe030606964..b486e4b09cd987482df726ef6af79db423b182e9 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -412,7 +412,7 @@ stages:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "3.5.0"]
+      command: ["--service", "docker", "3.5.1"]
   before_script:
     - *docker-scripts
 
@@ -441,7 +441,7 @@ stages:
     _TRACE: "${TRACE}"
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "3.5.0"]
+      command: ["--service", "docker", "3.5.1"]
     - name: $DOCKER_DIND_IMAGE
       alias: docker
       command: