diff --git a/gocd/slfo-stagings.gocd.yaml b/gocd/slfo-stagings.gocd.yaml
index c99ba295..7f80d4a9 100644
--- a/gocd/slfo-stagings.gocd.yaml
+++ b/gocd/slfo-stagings.gocd.yaml
@@ -18,7 +18,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:A_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -51,7 +52,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure
@@ -86,7 +87,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:B_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -119,7 +121,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure
@@ -154,7 +156,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:C_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -187,7 +190,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure
@@ -222,7 +225,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:D_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -255,7 +259,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure
@@ -290,7 +294,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:E_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -323,7 +328,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure
@@ -358,7 +363,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:F_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -391,7 +397,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure
@@ -426,7 +432,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:G_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -459,7 +466,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure
@@ -494,7 +501,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:H_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -527,7 +535,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure
@@ -562,7 +570,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:S_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -595,7 +604,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure
@@ -630,7 +639,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:V_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -663,7 +673,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure
@@ -698,7 +708,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:Y_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -731,7 +742,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure
diff --git a/gocd/slfo-stagings.gocd.yaml.erb b/gocd/slfo-stagings.gocd.yaml.erb
index a33f5a3c..b9b75c45 100644
--- a/gocd/slfo-stagings.gocd.yaml.erb
+++ b/gocd/slfo-stagings.gocd.yaml.erb
@@ -19,7 +19,8 @@ pipelines:
           - SUSE:SLFO:Main:Staging:<%= letter %>_-_standard.yaml
       scripts:
         auto_update: true
-        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        git: https://github.com/gleidi-suse/openSUSE-release-tools.git
+        branch: explicit_product_composer
         whitelist:
           - DO_NOT_TRIGGER
         destination: scripts
@@ -52,7 +53,7 @@ pipelines:
               export PYTHONPATH=$PWD/scripts
               cd scripts/gocd
 
-              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force; then
+              if ../pkglistgen.py --debug -A $STAGING_API update_and_solve --engine product_composer --staging $STAGING_PROJECT --force; then
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s success
               else
                 ./report-status.py -A $STAGING_API -p $STAGING_PROJECT -n packagelists -r standard -s failure