diff --git a/CHANGELOG.md b/CHANGELOG.md
index a212a4f419aff8371cf02d72d00ec1aa8c675cc8..6e0025eaedf0e02f114b0c49599b8e068c943082 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [2.6.0](https://gitlab.com/to-be-continuous/docker/compare/2.5.0...2.6.0) (2022-05-19)
+
+
+### Features
+
+* Make the --vuln-type Trivy argument configurable ([15457c6](https://gitlab.com/to-be-continuous/docker/commit/15457c6e8574b2f4ab4c22163f11118382fa27a2))
+
 # [2.5.0](https://gitlab.com/to-be-continuous/docker/compare/2.4.0...2.5.0) (2022-05-01)
 
 
diff --git a/README.md b/README.md
index f97ad93d509524cf885ca00c3c522ccfd737040b..c18c187f64b794e3c2e6cd64863b50c129f34846 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.5.0'
+    ref: '2.6.0'
     file: '/templates/gitlab-ci-docker.yml'
 ```
 
@@ -342,7 +342,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry:
 ```yaml
 include:
   - project: 'to-be-continuous/docker'
-    ref: '2.5.0'
+    ref: '2.6.0'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -360,7 +360,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.5.0'
+    ref: '2.6.0'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
@@ -416,11 +416,11 @@ With:
 include:
   # main template
   - project: 'to-be-continuous/docker'
-    ref: '2.5.0'
+    ref: '2.6.0'
     file: '/templates/gitlab-ci-docker.yml'
   # Vault variant
   - project: 'to-be-continuous/docker'
-    ref: '2.5.0'
+    ref: '2.6.0'
     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 82cea879306112e29b4718e5f855da76980a106d..00129c178fcccf470dafe53c0d82037f7560fc87 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", "2.5.0"]
+      command: ["--service", "docker", "2.6.0"]
     - 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 5c4d65dc3d71ecc1146a10a038341499cabe8d9e..d2f3310e0ecde256b2ce7fa8213c57b461291cf2 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -375,7 +375,7 @@ stages:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "2.5.0"]
+      command: ["--service", "docker", "2.6.0"]
   before_script:
     - *docker-scripts
 
@@ -404,7 +404,7 @@ stages:
     _TRACE: "${TRACE}"
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "2.5.0"]
+      command: ["--service", "docker", "2.6.0"]
     - name: $DOCKER_DIND_IMAGE
       alias: docker
       command: