diff --git a/gocd/pkglistgen.factory.gocd.yaml b/gocd/pkglistgen.factory.gocd.yaml
deleted file mode 100644
index 40894920..00000000
--- a/gocd/pkglistgen.factory.gocd.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-format_version: 3
-pipelines:
-  Pkglistgen.openSUSE_Factory:
-    group: Factory.pkglistgen
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 40 * ? * *
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - pkglistgen:
-        approval:
-          type: manual
-        jobs:
-          openSUSE_Factory_target:
-            resources:
-            - repo-checker3
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s target
-          openSUSE_Factory_rings:
-            resources:
-            - repo-checker3
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s rings
-          openSUSE_Factory_ARM:
-            resources:
-            - repo-checker3
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM 
-          openSUSE_Factory_PowerPC:
-            resources:
-            - repo-checker3
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:PowerPC 
-          openSUSE_Factory_zSystems:
-            resources:
-            - repo-checker3
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:zSystems 
-  Update.Repos.Factory:
-    group: Factory.pkglistgen
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 0 21 ? * *
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - Update:
-        approval:
-          type: manual
-        jobs:
-          openSUSE_Factory:
-            resources:
-            - repo-checker3
-            tasks:
-             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory
-          openSUSE_Factory_ARM:
-            resources:
-            - repo-checker3
-            tasks:
-             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory:ARM
-          openSUSE_Factory_PowerPC:
-            resources:
-            - repo-checker3
-            tasks:
-             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory:PowerPC
diff --git a/gocd/pkglistgen.factory.gocd.yaml.erb b/gocd/pkglistgen.factory.gocd.yaml.erb
deleted file mode 100644
index 1efd23fa..00000000
--- a/gocd/pkglistgen.factory.gocd.yaml.erb
+++ /dev/null
@@ -1,55 +0,0 @@
-format_version: 3
-pipelines:
-  Pkglistgen.openSUSE_Factory:
-    group: Factory.pkglistgen
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 40 * ? * *
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - pkglistgen:
-        approval:
-          type: manual
-        jobs:
-<% ['openSUSE:Factory/target', 'openSUSE:Factory/rings', 'openSUSE:Factory:ARM', 'openSUSE:Factory:PowerPC', 'openSUSE:Factory:zSystems'].each do |project|
-  project=project.split('/')
-  name=project[0].gsub(':', '_')
-  if project.size > 1
-    options="-s #{project[1]}"
-    name = name + "_#{project[1]}"
-  end
-  -%>
-          <%= name %>:
-            resources:
-            - repo-checker3
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %> <%= options %>
-<% end -%>
-  Update.Repos.Factory:
-    group: Factory.pkglistgen
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 0 21 ? * *
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - Update:
-        approval:
-          type: manual
-        jobs:
-<% %w(openSUSE:Factory openSUSE:Factory:ARM openSUSE:Factory:PowerPC).each do |project| -%>
-          <%= project.gsub(':', '_') %>:
-            resources:
-            - repo-checker3
-            tasks:
-             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos <%= project %>
-<% end -%>
diff --git a/gocd/pkglistgen.leap.gocd.yaml b/gocd/pkglistgen.leap.gocd.yaml
deleted file mode 100644
index 7cdfceae..00000000
--- a/gocd/pkglistgen.leap.gocd.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-format_version: 3
-pipelines:
-  Pkglistgen.openSUSE_Leap:
-    group: Leap.15.1.pkglistgen
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 10 * ? * *
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - pkglistgen:
-        approval:
-          type: manual
-        jobs:
-          openSUSE_Leap_15.1:
-            resources:
-            - repo-checker
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1 -s target
-          openSUSE_Leap_15.1_Ring:
-            resources:
-            - repo-checker
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1 -s rings
-          openSUSE_Leap_15.1_ARM:
-            resources:
-            - repo-checker
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1:ARM
-          openSUSE_Leap_15.1_PowerPC:
-            resources:
-            - repo-checker
-            tasks:
-            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1:PowerPC
-  Update.Repos.Leap:
-    group: Leap.15.1.pkglistgen
-    lock_behavior: unlockWhenFinished
-    environment_variables:
-      OSC_CONFIG: /home/go/config/oscrc-staging-bot
-    timer:
-      spec: 0 0 21 ? * *
-      only_on_changes: false
-    materials:
-      git:
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
-    stages:
-    - Update:
-        approval:
-          type: manual
-        jobs:
-          Leap:
-            tasks:
-             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1
-          Leap_ARM:
-            tasks:
-             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:ARM
-          Leap_PowerPC:
-            tasks:
-             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:PowerPC
diff --git a/gocd/pkglistgen.opensuse.gocd.yaml b/gocd/pkglistgen.opensuse.gocd.yaml
new file mode 100644
index 00000000..628a7820
--- /dev/null
+++ b/gocd/pkglistgen.opensuse.gocd.yaml
@@ -0,0 +1,141 @@
+format_version: 3
+pipelines:
+  Pkglistgen.openSUSE_Factory:
+    group: Factory.pkglistgen
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-staging-bot
+    timer:
+      spec: 0 40 * ? * *
+      only_on_changes: false
+    materials:
+      git:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+    stages:
+    - pkglistgen:
+        approval:
+          type: manual
+        jobs:
+          openSUSE_Factory_target:
+            resources:
+            - repo-checker3
+            tasks:
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s target
+          openSUSE_Factory_rings:
+            resources:
+            - repo-checker3
+            tasks:
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s rings
+          openSUSE_Factory_ARM:
+            resources:
+            - repo-checker3
+            tasks:
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM
+          openSUSE_Factory_PowerPC:
+            resources:
+            - repo-checker3
+            tasks:
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:PowerPC
+          openSUSE_Factory_zSystems:
+            resources:
+            - repo-checker3
+            tasks:
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:zSystems
+  Update.Repos.Factory:
+    group: Factory.pkglistgen
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-staging-bot
+    timer:
+      spec: 0 0 21 ? * *
+      only_on_changes: false
+    materials:
+      git:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+    stages:
+    - Update:
+        approval:
+          type: manual
+        jobs:
+          openSUSE_Factory:
+            resources:
+            - repo-checker3
+            tasks:
+             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory
+          openSUSE_Factory_ARM:
+            resources:
+            - repo-checker3
+            tasks:
+             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory:ARM
+          openSUSE_Factory_PowerPC:
+            resources:
+            - repo-checker3
+            tasks:
+             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory:PowerPC
+  Pkglistgen.openSUSE_Leap:
+    group: Leap.15.1.pkglistgen
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-staging-bot
+    timer:
+      spec: 0 10 * ? * *
+      only_on_changes: false
+    materials:
+      git:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+    stages:
+    - pkglistgen:
+        approval:
+          type: manual
+        jobs:
+          openSUSE_Leap_15.1_target:
+            resources:
+            - repo-checker3
+            tasks:
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1 -s target
+          openSUSE_Leap_15.1_rings:
+            resources:
+            - repo-checker3
+            tasks:
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1 -s rings
+          openSUSE_Leap_15.1_ARM:
+            resources:
+            - repo-checker3
+            tasks:
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1:ARM
+          openSUSE_Leap_15.1_PowerPC:
+            resources:
+            - repo-checker3
+            tasks:
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1:PowerPC
+  Update.Repos.Leap:
+    group: Leap.15.1.pkglistgen
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-staging-bot
+    timer:
+      spec: 0 0 21 ? * *
+      only_on_changes: false
+    materials:
+      git:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+    stages:
+    - Update:
+        approval:
+          type: manual
+        jobs:
+          openSUSE_Leap_15.1:
+            resources:
+            - repo-checker3
+            tasks:
+             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1
+          openSUSE_Leap_15.1_ARM:
+            resources:
+            - repo-checker3
+            tasks:
+             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:ARM
+          openSUSE_Leap_15.1_PowerPC:
+            resources:
+            - repo-checker3
+            tasks:
+             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:PowerPC
diff --git a/gocd/pkglistgen.opensuse.gocd.yaml.erb b/gocd/pkglistgen.opensuse.gocd.yaml.erb
new file mode 100644
index 00000000..c6f8684a
--- /dev/null
+++ b/gocd/pkglistgen.opensuse.gocd.yaml.erb
@@ -0,0 +1,107 @@
+format_version: 3
+pipelines:
+  Pkglistgen.openSUSE_Factory:
+    group: Factory.pkglistgen
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-staging-bot
+    timer:
+      spec: 0 40 * ? * *
+      only_on_changes: false
+    materials:
+      git:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+    stages:
+    - pkglistgen:
+        approval:
+          type: manual
+        jobs:
+<% ['openSUSE:Factory/target', 'openSUSE:Factory/rings', 'openSUSE:Factory:ARM', 'openSUSE:Factory:PowerPC', 'openSUSE:Factory:zSystems'].each do |project|
+  project=project.split('/')
+  name=project[0].gsub(':', '_')
+  if project.size > 1
+    options=" -s #{project[1]}"
+    name = name + "_#{project[1]}"
+  end
+  -%>
+          <%= name %>:
+            resources:
+            - repo-checker3
+            tasks:
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %>
+<% end -%>
+  Update.Repos.Factory:
+    group: Factory.pkglistgen
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-staging-bot
+    timer:
+      spec: 0 0 21 ? * *
+      only_on_changes: false
+    materials:
+      git:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+    stages:
+    - Update:
+        approval:
+          type: manual
+        jobs:
+<% %w(openSUSE:Factory openSUSE:Factory:ARM openSUSE:Factory:PowerPC).each do |project| -%>
+          <%= project.gsub(':', '_') %>:
+            resources:
+            - repo-checker3
+            tasks:
+             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos <%= project %>
+<% end -%>
+  Pkglistgen.openSUSE_Leap:
+    group: Leap.15.1.pkglistgen
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-staging-bot
+    timer:
+      spec: 0 10 * ? * *
+      only_on_changes: false
+    materials:
+      git:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+    stages:
+    - pkglistgen:
+        approval:
+          type: manual
+        jobs:
+  <% ['openSUSE:Leap:15.1/target', 'openSUSE:Leap:15.1/rings', 'openSUSE:Leap:15.1:ARM', 'openSUSE:Leap:15.1:PowerPC'].each do |project|
+    project=project.split('/')
+    name=project[0].gsub(':', '_')
+    if project.size > 1
+      options=" -s #{project[1]}"
+      name = name + "_#{project[1]}"
+    end -%>
+        <%= name %>:
+            resources:
+            - repo-checker3
+            tasks:
+            - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %>
+  <% end -%>
+Update.Repos.Leap:
+    group: Leap.15.1.pkglistgen
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-staging-bot
+    timer:
+      spec: 0 0 21 ? * *
+      only_on_changes: false
+    materials:
+      git:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+    stages:
+    - Update:
+        approval:
+          type: manual
+        jobs:
+<% %w(openSUSE:Leap:15.1 openSUSE:Leap:15.1:ARM openSUSE:Leap:15.1:PowerPC).each do |project| -%>
+          <%= project.gsub(':', '_') %>:
+            resources:
+            - repo-checker3
+            tasks:
+             - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos <%= project %>
+<% end -%>