diff --git a/_config b/_config
index 11348f4..f29505f 100644
--- a/_config
+++ b/_config
@@ -64,7 +64,9 @@ Prefer: kiwi-image-iso-requires
Prefer: kiwi-image-vmx-requires
# Migration to product builder
-Substitute: kiwi-packagemanager:instsource product-builder-plugin-Tumbleweed
+#Substitute: kiwi-packagemanager:instsource product-builder-plugin-Tumbleweed
+# use plugin-openSUSE
+Substitute: kiwi-packagemanager:instsource product-builder-plugin-openSUSE
Substitute: system-packages:kiwi-product product-builder
# allow builds using docker tool
diff --git a/_staging_workflow b/_staging_workflow
index 53031ac..123c850 100644
--- a/_staging_workflow
+++ b/_staging_workflow
@@ -52,10 +52,8 @@
-
-