diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1deb151..202f3c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,13 +10,11 @@ variables:
   DOCKER_IMAGE_PUBLISH_URL: https://hub.docker.com/r/nofusscomputing/$DOCKER_IMAGE_PUBLISH_NAME
 
 
-
 include:
   - project: nofusscomputing/projects/gitlab-ci
     ref: development
     file:
-      - .gitlab-ci_common.yaml
-      - template/docker-image.gitlab-ci.yaml
+      - template/automagic.gitlab-ci.yaml
   #- template: Jobs/Container-Scanning.gitlab-ci.yml # see https://gitlab.com/gitlab-org/gitlab/-/issues/381665
 
 
diff --git a/.nfc_automation.yaml b/.nfc_automation.yaml
new file mode 100644
index 0000000..077d7f4
--- /dev/null
+++ b/.nfc_automation.yaml
@@ -0,0 +1,8 @@
+---
+
+role_git_conf:
+  gitlab:
+    submodule_branch: "development"
+    default_branch: development
+    mr_labels: ~"type::automation" ~"impact::0" ~"priority::0"
+    auto_merge: true
diff --git a/gitlab-ci b/gitlab-ci
index 0a17fe1..e9713b3 160000
--- a/gitlab-ci
+++ b/gitlab-ci
@@ -1 +1 @@
-Subproject commit 0a17fe1aa320c658c05d7a693ff76af4a54e6130
+Subproject commit e9713b31c8e5b30c27331eea23a690194f63394f