diff --git a/gocd/pkglistgen.opensuse.gocd.yaml b/gocd/pkglistgen.opensuse.gocd.yaml
index 3807a6e2..e4c4fec5 100644
--- a/gocd/pkglistgen.opensuse.gocd.yaml
+++ b/gocd/pkglistgen.opensuse.gocd.yaml
@@ -146,7 +146,7 @@ pipelines:
             - script: python3 ./skippkg-finder.py -A https://api.opensuse.org -o openSUSE:Leap:15.3:Update:Respin -t openSUSE:Leap:15.3:Update -s SUSE:SLE-15-SP3:Update
             - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.3:Update:Respin -s target
 
-  Update.Repos.Leap:
+  Update.Repos.Leap.openSUSE_Leap_15.4:
     group: Leap.pkglistgen
     lock_behavior: unlockWhenFinished
     environment_variables:
@@ -167,6 +167,22 @@ pipelines:
             - repo-checker
             tasks:
              - script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.4
+  Update.Repos.Leap.openSUSE_Leap_15.3_Update_Respin:
+    group: Leap.pkglistgen
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-staging-bot
+    timer:
+      spec: 0 0 0 */3 * ?
+      only_on_changes: false
+    materials:
+      git:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+    stages:
+    - Update:
+        approval:
+          type: manual
+        jobs:
           openSUSE_Leap_15.3_Update_Respin:
             resources:
             - repo-checker
diff --git a/gocd/pkglistgen.opensuse.gocd.yaml.erb b/gocd/pkglistgen.opensuse.gocd.yaml.erb
index 3bb756ee..c3202cad 100644
--- a/gocd/pkglistgen.opensuse.gocd.yaml.erb
+++ b/gocd/pkglistgen.opensuse.gocd.yaml.erb
@@ -120,7 +120,8 @@ pipelines:
             - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %>
 <% end -%>
 
-  Update.Repos.Leap:
+<% %w(openSUSE:Leap:15.4 openSUSE:Leap:15.3:Update:Respin).each do |project| -%>
+  Update.Repos.Leap.<%= project.gsub(':', '_') %>:
     group: Leap.pkglistgen
     lock_behavior: unlockWhenFinished
     environment_variables:
@@ -136,7 +137,6 @@ pipelines:
         approval:
           type: manual
         jobs:
-<% %w(openSUSE:Leap:15.4 openSUSE:Leap:15.3:Update:Respin).each do |project| -%>
           <%= project.gsub(':', '_') %>:
             resources:
             - repo-checker