diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a0e75b8964167983c97be72bc3613587943d0c5..3fef8161464a7f45e4521d9d816181201874b6b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,8 @@ include:
 
 container_scanning:
   variables:
-    DOCKER_IMAGE: $CI_REGISTRY_IMAGE:16.0
-  only:
-    - "16.0"
+    DOCKER_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH
+    DOCKERFILE_PATH: $CI_COMMIT_BRANCH.Dockerfile
 
 docker-build-10.0:
   # Official docker image.