diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f386953de2b1e5e69cbb0ab67b9619429647182..4f0864ca0f36bf3f5faa04879a771c68f6cf906f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [5.5.4](https://gitlab.com/to-be-continuous/docker/compare/5.5.3...5.5.4) (2023-11-03)
+
+
+### Bug Fixes
+
+* handle port number in docker release image uri ([35e1b52](https://gitlab.com/to-be-continuous/docker/commit/35e1b522d3b154da3560a73e47e350748705d42b))
+
 ## [5.5.3](https://gitlab.com/to-be-continuous/docker/compare/5.5.2...5.5.3) (2023-10-18)
 
 
diff --git a/README.md b/README.md
index 157fb5e82d1aa877797cce974ab9dbe213f6ece4..d07867856a451e84330571bd5c9f4e38c6be09d1 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.5.3'
+    ref: '5.5.4'
     file: '/templates/gitlab-ci-docker.yml'
 ```
 
@@ -518,7 +518,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry:
 ```yaml
 include:
   - project: 'to-be-continuous/docker'
-    ref: '5.5.3'
+    ref: '5.5.4'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -536,7 +536,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.5.3'
+    ref: '5.5.4'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -594,11 +594,11 @@ With:
 include:
   # main template
   - project: 'to-be-continuous/docker'
-    ref: '5.5.3'
+    ref: '5.5.4'
     file: '/templates/gitlab-ci-docker.yml'
   # Vault variant
   - project: 'to-be-continuous/docker'
-    ref: '5.5.3'
+    ref: '5.5.4'
     file: '/templates/gitlab-ci-docker-vault.yml'
 
 variables:
diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml
index 586d88c3db82555b831c647d6127779c69db1e8f..b09aa8c1efd38afc3c0cf00a092bb5e15f9e9ad2 100644
--- a/templates/gitlab-ci-docker-ecr.yml
+++ b/templates/gitlab-ci-docker-ecr.yml
@@ -8,7 +8,7 @@ variables:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.5.3"]
+      command: ["--service", "docker", "5.5.4"]
     - name: "$TBC_AWS_AUTH_PROVIDER"
       alias: "aws-auth-provider"
   id_tokens:
diff --git a/templates/gitlab-ci-docker-gcp.yml b/templates/gitlab-ci-docker-gcp.yml
index d14056d374495c903407d21845d3f11ff109f0fa..28d35281b12f1d48f6b1f5e0457e260425e24a20 100644
--- a/templates/gitlab-ci-docker-gcp.yml
+++ b/templates/gitlab-ci-docker-gcp.yml
@@ -8,7 +8,7 @@ variables:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.5.3"]
+      command: ["--service", "docker", "5.5.4"]
     - name: "$TBC_GCP_AUTH_PROVIDER"
       alias: "gcp-auth-provider"
   variables:
diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml
index 6f90745de5c9e9d33de33e36291f434cfbdd7bb5..af25dd620f9b1dcbb22bface823361c1aaac3d29 100644
--- a/templates/gitlab-ci-docker-vault.yml
+++ b/templates/gitlab-ci-docker-vault.yml
@@ -12,7 +12,7 @@ variables:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.5.3"]
+      command: ["--service", "docker", "5.5.4"]
     - name: "$TBC_VAULT_IMAGE"
       alias: "vault-secrets-provider"
   variables:
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index d38eff35acb167dc39783a109e0332b26b9bfa1b..592738df23502cec613cf4481bcd698cb9ee8db2 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -481,7 +481,7 @@ stages:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.5.3"]
+      command: ["--service", "docker", "5.5.4"]
   before_script:
     - *docker-scripts
 
@@ -514,7 +514,7 @@ stages:
     _TRACE: "${TRACE}"
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.5.3"]
+      command: ["--service", "docker", "5.5.4"]
     - name: $DOCKER_DIND_IMAGE
       alias: docker
       command: