diff --git a/templates/docker-18.yml b/templates/docker-18.yml
new file mode 100644
index 0000000000000000000000000000000000000000..869772209a22988991555a3fc4f67fa1bb2e99b8
--- /dev/null
+++ b/templates/docker-18.yml
@@ -0,0 +1,8 @@
+.docker:
+  image: docker:18
+  environment:
+    DOCKER_BUILDKIT: 1
+  services:
+    - name: docker:18-dind-rootless
+  tags:
+    - docker-images
diff --git a/templates/docker-20.yml b/templates/docker-20.yml
new file mode 100644
index 0000000000000000000000000000000000000000..11375efffb214969c8c828be9fa6744a0794e775
--- /dev/null
+++ b/templates/docker-20.yml
@@ -0,0 +1,8 @@
+.docker:
+  image: docker:20
+  environment:
+    DOCKER_BUILDKIT: 1
+  services:
+    - name: docker:20-dind-rootless
+  tags:
+    - docker-images
diff --git a/templates/docker-23.yml b/templates/docker-23.yml
new file mode 100644
index 0000000000000000000000000000000000000000..595f0a928b2a9390944a38fe34eb7dce64ea1e8b
--- /dev/null
+++ b/templates/docker-23.yml
@@ -0,0 +1,8 @@
+.docker:
+  image: docker:23
+  environment:
+    DOCKER_BUILDKIT: 1
+  services:
+    - name: docker:23-dind-rootless
+  tags:
+    - docker-images
diff --git a/templates/docker-24.yml b/templates/docker-24.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c81c32e0a84eb8239a99cd06a3408ca663525302
--- /dev/null
+++ b/templates/docker-24.yml
@@ -0,0 +1,8 @@
+.docker:
+  image: docker:24
+  environment:
+    DOCKER_BUILDKIT: 1
+  services:
+    - name: docker:24-dind-rootless
+  tags:
+    - docker-images
diff --git a/templates/registry.yml b/templates/registry.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3cbc8c1f3d191b92189271ea9b2f762af19c17e6
--- /dev/null
+++ b/templates/registry.yml
@@ -0,0 +1,9 @@
+.nexus:
+  extends: .docker
+  before_script:
+    - echo "$NEXUS_CREDS_PSW" | docker login -u $NEXUS_CREDS_USR --password-stdin $PATRINAT_REGISTRY
+
+.gitlab-registry:
+  extends: .docker
+  before_script:
+    - echo "$CI_REGISTRY_PASSWORD" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
diff --git a/templates/vul-scan.yml b/templates/vul-scan.yml
index 23661aafea9500d8fb79abcc35e0aa21e9f04cdd..e6f57012cde83e6eb16b140d542336668b492b8a 100644
--- a/templates/vul-scan.yml
+++ b/templates/vul-scan.yml
@@ -55,6 +55,6 @@
     expire_in: 7 days
     when: on_failure
     reports:
-      container_scanning:          gl-container-scanning-report.json
+      container_scanning: gl-container-scanning-report.json
   tags:
     - trivy