diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f48df8f..ffa51e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,7 @@ include:
     ref: development
     file:
       - .gitlab-ci_common.yaml
-      - template/docker-image.gitlab-ci.yaml
-      - template/website.gitlab-ci.yaml
+      - template/automagic.gitlab-ci.yaml
 
 
 variables:
@@ -37,31 +36,3 @@ Compile Dovecot:
       when: manual
       allow_failure: true
     - when: never
-
-
-Website:Stage.Publish:
-  stage: publish
-  trigger:
-    project: nofusscomputing/infrastructure/website
-    branch: development
-  needs: [ Website.Build ]
-  rules:
-    - if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
-      when: never
-    - if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == "development"'
-      when: on_success
-    - when: never
-
-
-Website:Deploy.Publish:
-  stage: publish
-  trigger:
-    project: nofusscomputing/infrastructure/website
-    branch: development
-  needs: [ Website.Build ]
-  rules:
-    - if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
-      when: never
-    - if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == "master"'
-      when: on_success
-    - when: never
\ No newline at end of file