diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d4d6971c006db4e269af2ec278a40be0b525d30..7e4742d3ec62a16c84fa26846735d554e6eb5d5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [2.1.1](https://gitlab.com/to-be-continuous/docker/compare/2.1.0...2.1.1) (2021-10-07)
+
+
+### Bug Fixes
+
+* use master or main for production env ([5596daf](https://gitlab.com/to-be-continuous/docker/commit/5596daf34cc9c64d73405ef490fe75c7ae50a177))
+
 ## [2.0.0](https://gitlab.com/to-be-continuous/docker/compare/1.2.3...2.0.0) (2021-09-02)
 
 ### Features
diff --git a/README.md b/README.md
index d35a0b5bebd1d763cdc22251da15a0f91290cae3..5e92dfc6932ddb36ee7f91d31df7ac8d5671c132 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: '2.1.0'
+    ref: '2.1.1'
     file: '/templates/gitlab-ci-docker.yml'
 ```
 
@@ -307,7 +307,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry:
 ```yaml
 include:
   - project: 'to-be-continuous/docker'
-    ref: '2.1.0'
+    ref: '2.1.1'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -325,7 +325,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: '2.1.0'
+    ref: '2.1.1'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index cd4f5e26aa7c1c1caa65a725e2d48055e1d23427..e42638b52b0bc2a3eeccb779ef9c4a88755fce7e 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -367,7 +367,7 @@ stages:
     fi
   }
 
-  if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.1.0"; fi
+  if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.1.1"; fi
   init_workspace
 
   # ENDSCRIPT
@@ -375,7 +375,7 @@ stages:
 .docker-base:
   services:
     - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
-      command: ["--service", "docker", "2.1.0"]
+      command: ["--service", "docker", "2.1.1"]
   before_script:
     - *docker-scripts
 
@@ -404,7 +404,7 @@ stages:
     _TRACE: "${TRACE}"
   services:
     - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
-      command: ["--service", "docker", "2.1.0"]
+      command: ["--service", "docker", "2.1.1"]
     - name: $DOCKER_DIND_IMAGE
       alias: docker
       command: