diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecbe87ba4f7ae0d38a33769368b6c980f0f3617c..8549f6db1e7a5a4429df7a626d011aac70ee6153 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [3.1.1](https://gitlab.com/to-be-continuous/docker/compare/3.1.0...3.1.1) (2022-09-28)
+
+
+### Bug Fixes
+
+* support DOCKER_XX_IMAGE with registry port ([54e9e05](https://gitlab.com/to-be-continuous/docker/commit/54e9e05f810b8abb81440cba7dd8ebd7e89644a9))
+
 # [3.1.0](https://gitlab.com/to-be-continuous/docker/compare/3.0.0...3.1.0) (2022-09-20)
 
 
diff --git a/README.md b/README.md
index 77cc0aeff1db152b1c60023388b8ce731ff78d9e..dc477129fcbabee7b6ea33b97fca949e53c57b5d 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.1.0'
+    ref: '3.1.1'
     file: '/templates/gitlab-ci-docker.yml'
 ```
 
@@ -423,7 +423,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry:
 ```yaml
 include:
   - project: 'to-be-continuous/docker'
-    ref: '3.1.0'
+    ref: '3.1.1'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -441,7 +441,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.1.0'
+    ref: '3.1.1'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -497,11 +497,11 @@ With:
 include:
   # main template
   - project: 'to-be-continuous/docker'
-    ref: '3.1.0'
+    ref: '3.1.1'
     file: '/templates/gitlab-ci-docker.yml'
   # Vault variant
   - project: 'to-be-continuous/docker'
-    ref: '3.1.0'
+    ref: '3.1.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 3799fa08c3e78dbd5c990b8eb872947abfafab83..d6b50e4debc70e8f776b6813c7a9c27e1c7fc27c 100644
--- a/templates/gitlab-ci-docker-vault.yml
+++ b/templates/gitlab-ci-docker-vault.yml
@@ -9,6 +9,6 @@ variables:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "3.1.0"]
+      command: ["--service", "docker", "3.1.1"]
     - name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master"
       alias: "vault-secrets-provider"
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index 600b50a2326d5d8ac163c6fbbeb1959bf04f3326..63f04c701378e1e667fbb7686bab9adc564b6a13 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -408,7 +408,7 @@ stages:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "3.1.0"]
+      command: ["--service", "docker", "3.1.1"]
   before_script:
     - *docker-scripts
 
@@ -437,7 +437,7 @@ stages:
     _TRACE: "${TRACE}"
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "3.1.0"]
+      command: ["--service", "docker", "3.1.1"]
     - name: $DOCKER_DIND_IMAGE
       alias: docker
       command: