diff --git a/gocd/alp.target.gocd.yaml b/gocd/alp.target.gocd.yaml
new file mode 100644
index 00000000..ce336066
--- /dev/null
+++ b/gocd/alp.target.gocd.yaml
@@ -0,0 +1,66 @@
+format_version: 3
+pipelines:
+  Installer.Images:
+    group: ALP.Target
+    lock_behavior: unlockWhenFinished
+    materials:
+      repos:
+        git: git://botmaster.suse.de/suse-repos.git
+        auto_update: true
+        whitelist:
+          - SUSE:ALP:Products:Installer:1.0_-_images.yaml
+        destination: repos
+      scripts:
+        auto_update: true
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        whitelist:
+          - DO_NOT_TRIGGER
+        destination: scripts
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-staging-bot
+    stages:
+    - Expect.Images.To.Finish:
+        resources:
+        - staging-bot
+        tasks:
+        - script: |
+            export PYTHONPATH=scripts
+            set -e
+            ./scripts/gocd/verify-repo-built-successful.py -A https://api.suse.de -p SUSE:ALP:Products:Installer:1.0 -r images
+
+    - Release.Images.To.Test:
+        approval: manual
+        roles:
+        - SLE
+        environment_variables:
+          OSC_CONFIG: /home/go/config/oscrc-totest-manager
+        resources:
+        - staging-bot
+        tasks:
+        - script: |-
+            osc -A https://api.suse.de release SUSE:ALP:Products:Installer:1.0
+            sleep 600
+            while (osc -A https://api.suse.de/ api "/build/SUSE:ALP:Products:Installer:1.0:ToTest/_result?view=summary&repository=images" | grep "result project" | grep -v 'code="published" state="published">'); do
+                echo PENDING
+                sleep 600
+            done
+            osc -A https://api.suse.de/ api "/build/SUSE:ALP:Products:Installer:1.0:ToTest/_result?view=summary&repository=images" | grep "result project" | grep 'code="published" state="published">' && echo PUBLISHED
+
+    - Release.Images.To.Publish:
+        approval: manual
+        roles:
+        - SLE
+        environment_variables:
+          OSC_CONFIG: /home/go/config/oscrc-totest-manager
+        resources:
+        - staging-bot
+        tasks:
+        - script: |-
+            osc -A https://api.suse.de release SUSE:ALP:Products:Installer:1.0:ToTest
+            sleep 600
+            while (osc -A https://api.suse.de/ api "/build/SUSE:ALP:Products:Installer:1.0:PUBLISH/_result?view=summary&repository=images" | grep "result project" | grep -v 'code="published" state="published">'); do
+                echo PENDING
+                sleep 600
+            done
+            osc -A https://api.suse.de/ api "/build/SUSE:ALP:Products:Installer:1.0:PUBLISH/_result?view=summary&repository=images" | grep "result project" | grep 'code="published" state="published">' && echo PUBLISHED
+
diff --git a/gocd/dolomite.target.gocd.yaml b/gocd/dolomite.target.gocd.yaml
index 95178232..237f8d91 100644
--- a/gocd/dolomite.target.gocd.yaml
+++ b/gocd/dolomite.target.gocd.yaml
@@ -76,173 +76,3 @@ pipelines:
             done
             osc -A https://api.suse.de/ api "/build/SUSE:ALP:Products:Dolomite:1.0:PUBLISH/_result?view=summary&repository=images" | grep "result project" | grep 'code="published" state="published">' && echo PUBLISHED
 
-  Dolomite.Images.NEW:
-    group: ALP.Target
-    lock_behavior: unlockWhenFinished
-    materials:
-      repos:
-        git: git://botmaster.suse.de/suse-repos.git
-        auto_update: true
-        whitelist:
-          - SUSE:ALP:Products:Dolomite:1.0_-_images.yaml
-        destination: repos
-      scripts:
-        auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-        whitelist:
-          - DO_NOT_TRIGGER
-        destination: scripts
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    stages:
-    - Expect.Images.To.Finish:
-        resources:
-        - staging-bot
-        tasks:
-        - script: |
-            export PYTHONPATH=scripts
-            set -e
-            ./scripts/gocd/verify-repo-built-successful.py -A https://api.suse.de -p SUSE:ALP:Products:Dolomite:1.0 -r containerfile
-            ./scripts/gocd/verify-repo-built-successful.py -A https://api.suse.de -p SUSE:ALP:Products:Dolomite:1.0 -r images
-
-    - Release.Images.To.Test:
-        approval: manual
-        roles:
-        - SLE
-        environment_variables:
-          OSC_CONFIG: /home/go/config/oscrc-totest-manager
-          JIRA_PAT: /home/go/config/jira-pat
-          JIRA_INSTANCE: /home/go/config/jira-instance
-        resources:
-        - staging-bot
-        tasks:
-        - script: |-
-            sle-prjmgr-tools --jira-instance $JIRA_INSTANCE --osc-config $OSC_CONFIG ibs_to_jira --jira-pat $JIRA_PAT -p SUSE:ALP:Products:Dolomite:1.0
-
-    - Release.Images.To.Publish:
-        approval: manual
-        roles:
-        - SLE
-        environment_variables:
-          OSC_CONFIG: /home/go/config/oscrc-totest-manager
-        resources:
-        - staging-bot
-        tasks:
-        - script: |-
-            osc -A https://api.suse.de release SUSE:ALP:Products:Dolomite:1.0:ToTest
-            sleep 600
-            while (osc -A https://api.suse.de/ api "/build/SUSE:ALP:Products:Dolomite:1.0:PUBLISH/_result?view=summary&repository=containers" | grep "result project" | grep -v 'code="published" state="published">'); do
-                echo PENDING
-                sleep 600
-            done
-            osc -A https://api.suse.de/ api "/build/SUSE:ALP:Products:Dolomite:1.0:PUBLISH/_result?view=summary&repository=containers" | grep "result project" | grep 'code="published" state="published">' && echo PUBLISHED
-            while (osc -A https://api.suse.de/ api "/build/SUSE:ALP:Products:Dolomite:1.0:PUBLISH/_result?view=summary&repository=images" | grep "result project" | grep -v 'code="published" state="published">'); do
-                echo PENDING
-                sleep 600
-            done
-            osc -A https://api.suse.de/ api "/build/SUSE:ALP:Products:Dolomite:1.0:PUBLISH/_result?view=summary&repository=images" | grep "result project" | grep 'code="published" state="published">' && echo PUBLISHED
-
-  Dolomite.ImagesManual:
-    group: ALP.Target
-    lock_behavior: unlockWhenFinished
-    materials:
-      repos:
-        git: git://botmaster.suse.de/suse-repos.git
-        auto_update: true
-        whitelist:
-          - SUSE:ALP:Products:Dolomite:1.0_-_images.yaml
-        destination: repos
-      scripts:
-        auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-        whitelist:
-          - DO_NOT_TRIGGER
-        destination: scripts
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    stages:
-    - Relase.Images.To.Test:
-        approval: manual
-        roles:
-          - SLE
-        jobs:
-          Check.Images.Finish:
-            resources:
-              - staging-bot
-            tasks:
-              - script: |
-                  export PYTHONPATH=scripts
-                  while (! ./scripts/gocd/verify-repo-built-successful.py -A https://api.suse.de -p SUSE:ALP:Products:Dolomite:1.0 -r images); do
-                    sleep 300
-                  done
-          Release.To.Test:
-            environment_variables:
-              OSC_CONFIG: /home/go/config/oscrc-totest-manager
-            resources:
-              - staging-bot
-            tasks:
-              - script: |-
-                  set -e
-                  PRODUCTS=$(osc -A https://api.suse.de ls SUSE:ALP:Products:Dolomite:1.0 | grep "^ALP-Dolomite" | grep -v release)
-                  for product in 000product $PRODUCTS; do
-                    osc -A https://api.suse.de release SUSE:ALP:Products:Dolomite:1.0 $product
-                  done
-
-    - Release.Images.To.Publish:
-        approval: manual
-        roles:
-          - SLE
-        environment_variables:
-          OSC_CONFIG: /home/go/config/oscrc-totest-manager
-        resources:
-          - staging-bot
-        tasks:
-          - script: osc -A https://api.suse.de release SUSE:ALP:Products:Dolomite:1.0:ToTest
-
-  Dolomite.ReleaseScc:
-    group: ALP.Target
-    parameters:
-      product: dolomite-1.0
-      target: MyTarget
-      build: "0.0"
-    materials:
-      scripts:
-        auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-        whitelist:
-          - DO_NOT_TRIGGER
-        destination: scripts
-    stages:
-    # "ratt" is an alias for the internal IP of the API, only available on botmaster.
-    - Release.Images.Update:
-        approval: manual
-        roles:
-          - SLE
-        resources:
-          - staging-bot
-        tasks:
-          - script: curl --verbose --max-time 3600 "http://ratt:5000/update?product=#{product}&target=#{target}&build=#{build}"
-    - Release.Images.Rename:
-        approval: manual
-        roles:
-          - SLE
-        resources:
-          - staging-bot
-        tasks:
-          - script: curl --verbose --max-time 3600 "http://ratt:5000/rename?product=#{product}&target=#{target}"
-    - Release.Images.Sync:
-        approval: manual
-        roles:
-          - SLE
-        resources:
-          - staging-bot
-        tasks:
-          - script: curl --verbose --max-time 3600 "http://ratt:5000/sync?product=#{product}&target=#{target}"
-    - Release.Images.Release:
-        approval: manual
-        roles:
-          - SLE
-        resources:
-          - staging-bot
-        tasks:
-          - script: curl --verbose --max-time 3600 "http://ratt:5000/release?product=#{product}"
diff --git a/gocd/sp.target.gocd.yaml b/gocd/sp.target.gocd.yaml
index c7210cc4..3ea1612d 100644
--- a/gocd/sp.target.gocd.yaml
+++ b/gocd/sp.target.gocd.yaml
@@ -87,181 +87,3 @@ pipelines:
             done
             osc -A https://api.suse.de/ api "/build/SUSE:SLE-15-SP6:GA:PUBLISH/_result?view=summary&repository=images" | grep "result project" | grep 'code="published" state="published">' && echo PUBLISHED
 
-  SLE15.SP6.Images.NEW:
-    group: SLE15.Target
-    lock_behavior: unlockWhenFinished
-    materials:
-      repos:
-        git: git://botmaster.suse.de/suse-repos.git
-        auto_update: true
-        whitelist:
-          - SUSE:SLE-15-SP6:GA_-_images.yaml
-        destination: repos
-      scripts:
-        auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-        whitelist:
-          - DO_NOT_TRIGGER
-        destination: scripts
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    stages:
-    - Expect.Images.To.Finish:
-        resources:
-        - staging-bot
-        tasks:
-        - script: |
-            export PYTHONPATH=scripts
-            set -e
-            ./scripts/gocd/verify-repo-built-successful.py -A https://api.suse.de -p SUSE:SLE-15-SP6:GA -r containerfile
-            ./scripts/gocd/verify-repo-built-successful.py -A https://api.suse.de -p SUSE:SLE-15-SP6:GA -r images
-
-    - Release.Images.To.Test:
-        approval: manual
-        roles:
-        - SLE
-        environment_variables:
-          OSC_CONFIG: /home/go/config/oscrc-totest-manager
-          JIRA_PAT: /home/go/config/jira-pat
-          JIRA_INSTANCE: /home/go/config/jira-instance
-        resources:
-        - staging-bot
-        tasks:
-        - script: |-
-            sle-prjmgr-tools --jira-instance $JIRA_INSTANCE --osc-config $OSC_CONFIG ibs_to_jira --jira-pat $JIRA_PAT -p SUSE:SLE-15-SP6:GA
-
-    - Release.Images.To.Publish:
-        approval: manual
-        roles:
-        - SLE
-        environment_variables:
-          OSC_CONFIG: /home/go/config/oscrc-totest-manager
-        resources:
-        - staging-bot
-        tasks:
-        - script: |-
-            osc -A https://api.suse.de release SUSE:SLE-15-SP6:GA:TEST
-            sleep 600
-            while (osc -A https://api.suse.de/ api "/build/SUSE:SLE-15-SP6:GA:PUBLISH/_result?view=summary&repository=containers" | grep "result project" | grep -v 'code="published" state="published">'); do
-                echo PENDING
-                sleep 600
-            done
-            osc -A https://api.suse.de/ api "/build/SUSE:SLE-15-SP6:GA:PUBLISH/_result?view=summary&repository=containers" | grep "result project" | grep 'code="published" state="published">' && echo PUBLISHED
-            while (osc -A https://api.suse.de/ api "/build/SUSE:SLE-15-SP6:GA:PUBLISH/_result?view=summary&repository=images" | grep "result project" | grep -v 'code="published" state="published">'); do
-                echo PENDING
-                sleep 600
-            done
-            osc -A https://api.suse.de/ api "/build/SUSE:SLE-15-SP6:GA:PUBLISH/_result?view=summary&repository=images" | grep "result project" | grep 'code="published" state="published">' && echo PUBLISHED
-
-  SLE15.SP6.ImagesManual:
-    group: SLE15.Target
-    lock_behavior: unlockWhenFinished
-    materials:
-      repos:
-        git: git://botmaster.suse.de/suse-repos.git
-        auto_update: true
-        whitelist:
-          - SUSE:SLE-15-SP6:GA_-_images.yaml
-        destination: repos
-      scripts:
-        auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-        whitelist:
-          - DO_NOT_TRIGGER
-        destination: scripts
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    stages:
-    - Relase.Images.To.Test:
-        approval: manual
-        roles:
-          - SLE
-        jobs:
-          Check.Images.Finish:
-            resources:
-              - staging-bot
-            tasks:
-              - script: |
-                  export PYTHONPATH=scripts
-                  while (! ./scripts/gocd/verify-repo-built-successful.py -A https://api.suse.de -p SUSE:SLE-15-SP6:GA -r containerfile); do
-                    sleep 300
-                  done
-                  while (! ./scripts/gocd/verify-repo-built-successful.py -A https://api.suse.de -p SUSE:SLE-15-SP6:GA -r images); do
-                    sleep 300
-                  done
-          Release.To.Test:
-            environment_variables:
-              OSC_CONFIG: /home/go/config/oscrc-totest-manager
-            resources:
-              - staging-bot
-            tasks:
-              - script: |-
-                  set -e
-                  CONTAINERS=$(osc -A https://api.suse.de ls SUSE:SLE-15-SP6:GA | grep "^\(cdi\|virt\)-.*-container")
-                  for container in $CONTAINERS; do
-                    osc -A https://api.suse.de release --target-project=SUSE:SLE-15-SP6:GA:TEST --target-repository=containers -r containerfile SUSE:SLE-15-SP6:GA $container
-                  done
-                  osc -A https://api.suse.de release --target-project=SUSE:SLE-15-SP6:GA:TEST --target-repository=containers -r images SUSE:SLE-15-SP6:GA sles15-image
-                  PRODUCTS=$(osc -A https://api.suse.de ls SUSE:SLE-15-SP6:GA | grep "^SLES15-SP6" | grep -v release)
-                  for product in kiwi-templates-Minimal kiwi-templates-Minimal-s390x 000product $PRODUCTS; do
-                    osc -A https://api.suse.de release SUSE:SLE-15-SP6:GA $product
-                  done
-
-    - Release.Images.To.Publish:
-        approval: manual
-        roles:
-          - SLE
-        environment_variables:
-          OSC_CONFIG: /home/go/config/oscrc-totest-manager
-        resources:
-          - staging-bot
-        tasks:
-          - script: osc -A https://api.suse.de release SUSE:SLE-15-SP6:GA:TEST
-
-  SLE15.SP6.ReleaseScc:
-    group: SLE15.Target
-    parameters:
-      product: sle15sp6
-      target: MyTarget
-      build: "0.0"
-    materials:
-      scripts:
-        auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-        whitelist:
-          - DO_NOT_TRIGGER
-        destination: scripts
-    stages:
-    # "ratt" is an alias for the internal IP of the API, only available on botmaster.
-    - Release.Images.Update:
-        approval: manual
-        roles:
-          - SLE
-        resources:
-          - staging-bot
-        tasks:
-          - script: curl --verbose --max-time 3600 "http://ratt:5000/update?product=#{product}&target=#{target}&build=#{build}"
-    - Release.Images.Rename:
-        approval: manual
-        roles:
-          - SLE
-        resources:
-          - staging-bot
-        tasks:
-          - script: curl --verbose --max-time 3600 "http://ratt:5000/rename?product=#{product}&target=#{target}"
-    - Release.Images.Sync:
-        approval: manual
-        roles:
-          - SLE
-        resources:
-          - staging-bot
-        tasks:
-          - script: curl --verbose --max-time 3600 "http://ratt:5000/sync?product=#{product}&target=#{target}"
-    - Release.Images.Release:
-        approval: manual
-        roles:
-          - SLE
-        resources:
-          - staging-bot
-        tasks:
-          - script: curl --verbose --max-time 3600 "http://ratt:5000/release?product=#{product}"