diff --git a/CHANGELOG.md b/CHANGELOG.md
index d19e0d0fff2abfb916dda0235ed189fb0021c680..953e94a5822a8f37beb8968a28b4774c0d0ebb84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [5.11.1](https://gitlab.com/to-be-continuous/docker/compare/5.11.0...5.11.1) (2024-08-13)
+
+
+### Bug Fixes
+
+* **build:** support metadata labels and build command arguments containing spaces ([ac391c3](https://gitlab.com/to-be-continuous/docker/commit/ac391c3aa1b7811abddeef0e68a2916669687036))
+
 # [5.11.0](https://gitlab.com/to-be-continuous/docker/compare/5.10.3...5.11.0) (2024-07-05)
 
 
diff --git a/README.md b/README.md
index ec649c5dca3c00ff4c73045b68d13c781fc6d185..db8b19dd11eb798486806b5a338cd40126eb50df 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Add the following to your `.gitlab-ci.yml`:
 ```yaml
 include:
   # 1: include the component
-  - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.11.0
+  - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.11.1
     # 2: set/override component inputs
     inputs:
       build-tool: buildah # ⚠ this is only an example
@@ -28,7 +28,7 @@ Add the following to your `.gitlab-ci.yml`:
 include:
   # 1: include the template
   - project: 'to-be-continuous/docker'
-    ref: '5.11.0'
+    ref: '5.11.1'
     file: '/templates/gitlab-ci-docker.yml'
 
 variables:
diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml
index 9db80cd9a1cc7e56a9391049f8639116b5d7af11..47067acd7090974ca16fd1570802ea3f1cbc6ffc 100644
--- a/templates/gitlab-ci-docker-ecr.yml
+++ b/templates/gitlab-ci-docker-ecr.yml
@@ -45,7 +45,7 @@ variables:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.11.0"]
+      command: ["--service", "docker", "5.11.1"]
     - name: "$TBC_AWS_PROVIDER_IMAGE"
       alias: "aws-auth-provider"
   id_tokens:
diff --git a/templates/gitlab-ci-docker-gcp.yml b/templates/gitlab-ci-docker-gcp.yml
index 10280f80f4df9332031c58da249d71c5d596bd43..f88bd780c59431bcf4186d8fa6827de8eda93c31 100644
--- a/templates/gitlab-ci-docker-gcp.yml
+++ b/templates/gitlab-ci-docker-gcp.yml
@@ -44,7 +44,7 @@ variables:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.11.0"]
+      command: ["--service", "docker", "5.11.1"]
     - name: "$TBC_GCP_PROVIDER_IMAGE"
       alias: "gcp-auth-provider"
   variables:
diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml
index d79473f647548f4d5091eb5f838f4dfed7863b80..18cee8870d9844bfb7bc7c7e975889fe4c80aedd 100644
--- a/templates/gitlab-ci-docker-vault.yml
+++ b/templates/gitlab-ci-docker-vault.yml
@@ -22,7 +22,7 @@ variables:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.11.0"]
+      command: ["--service", "docker", "5.11.1"]
     - name: "$TBC_VAULT_IMAGE"
       alias: "vault-secrets-provider"
   variables:
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index 7bcd915468666988bbdc8515381ae35fea2db4ed..c5b62625bbbf559f1ccaf011d5cdd10dd0149606 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -664,7 +664,7 @@ stages:
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.11.0"]
+      command: ["--service", "docker", "5.11.1"]
   before_script:
     - !reference [.docker-scripts]
 
@@ -700,7 +700,7 @@ stages:
     _TRACE: "${TRACE}"
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker", "5.11.0"]
+      command: ["--service", "docker", "5.11.1"]
     - name: $DOCKER_DIND_IMAGE
       alias: docker
       command: