diff --git a/gocd/sp3.target.gocd.yaml b/gocd/sp3.target.gocd.yaml
index f1e4425c..061e05dc 100644
--- a/gocd/sp3.target.gocd.yaml
+++ b/gocd/sp3.target.gocd.yaml
@@ -81,10 +81,14 @@ pipelines:
         - staging-bot
         tasks:
         - script: |-
-            PRODUCTS=$(osc -A https://api.suse.de ls SUSE:SLE-15-SP3:GA | grep "^SLE" | grep -v release)
+            PRODUCTS=$(osc -A https://api.suse.de ls SUSE:SLE-15-SP3:GA | grep "^SLES-15-SP3" | grep -v release)
             for product in kiwi-templates-JeOS 000product $PRODUCTS; do
               osc -A https://api.suse.de release SUSE:SLE-15-SP3:GA $product
             done
+            PRODUCTS_NDB=$(osc -A https://api.suse.de ls SUSE:SLE-15-SP3:GA | grep "^SLES15-SP3" | grep -v release)
+            for product_ndb in $PRODUCTS_NDB ; do
+              osc -A https://api.suse.de release SUSE:SLE-15-SP3:GA $product_ndb -r images-ndb --target-project SUSE:SLE-15-SP3:GA:TEST --target-repository images
+            done
             osc -A https://api.suse.de release SUSE:SLE-15-SP3:Update:CR sles15-image
 
     - Release.Images.To.Publish:
@@ -138,10 +142,14 @@ pipelines:
               - staging-bot
             tasks:
               - script: |-
-                  PRODUCTS=$(osc -A https://api.suse.de ls SUSE:SLE-15-SP3:GA | grep "^SLE" | grep -v release)
+                  PRODUCTS=$(osc -A https://api.suse.de ls SUSE:SLE-15-SP3:GA | grep "^SLES-15-SP3" | grep -v release)
                   for product in kiwi-templates-JeOS 000product $PRODUCTS; do
                     osc -A https://api.suse.de release SUSE:SLE-15-SP3:GA $product
                   done
+                  PRODUCTS_NDB=$(osc -A https://api.suse.de ls SUSE:SLE-15-SP3:GA | grep "^SLES15-SP3" | grep -v release)
+                  for product_ndb in $PRODUCTS_NDB ; do
+                    osc -A https://api.suse.de release SUSE:SLE-15-SP3:GA $product_ndb -r images-ndb --target-project SUSE:SLE-15-SP3:GA:TEST --target-repository images
+                  done
                   osc -A https://api.suse.de release SUSE:SLE-15-SP3:Update:CR sles15-image
 
     - Release.Images.To.Publish: