diff --git a/changelogs/unreleased/patch-29.yml b/changelogs/unreleased/patch-29.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e5e1d639a694218fb440c43647fb1e28273234ca
--- /dev/null
+++ b/changelogs/unreleased/patch-29.yml
@@ -0,0 +1,5 @@
+---
+title: Better job naming for Docker.gitlab-ci.yml
+merge_request: 17218
+author: luca.orlandi@gmail.com
+type: other
diff --git a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
index f6d240b7b6d8383ead58ebfcd37d36b748ae2808..15cdbf63cb1cd047f6623a048d5f8b531063e61a 100644
--- a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
@@ -1,4 +1,4 @@
-build-master:
+docker-build-master:
   # Official docker image.
   image: docker:latest
   stage: build
@@ -12,7 +12,7 @@ build-master:
   only:
     - master
 
-build:
+docker-build:
   # Official docker image.
   image: docker:latest
   stage: build