diff --git a/DVD5-i586.group b/DVD5-i586.group
index ca9d14d4..52558b31 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -3557,7 +3557,7 @@
     <package name="lifecycle-data-openSUSE"/>
     <package name="lightdm"/>
     <package name="lightdm-gtk-greeter"/>
-    <package name="lightdm-gtk-greeter-branding-openSUSE"/>
+    <package name="lightdm-gtk-greeter-branding-upstream"/>
     <package name="lightdm-gtk-greeter-lang"/>
     <package name="lightdm-lang"/>
     <package name="lightsoff"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index 75349695..1df07f6c 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -3728,7 +3728,7 @@
     <package name="lifecycle-data-openSUSE"/>
     <package name="lightdm"/>
     <package name="lightdm-gtk-greeter"/>
-    <package name="lightdm-gtk-greeter-branding-openSUSE"/>
+    <package name="lightdm-gtk-greeter-branding-upstream"/>
     <package name="lightdm-gtk-greeter-lang"/>
     <package name="lightdm-lang"/>
     <package name="lightsoff"/>
diff --git a/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
index 3b4dbcb1..81104a1a 100644
--- a/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
@@ -555,6 +555,7 @@
       <repopackage name="pam-config"/>
       <repopackage name="parted"/>
       <repopackage name="patterns-caasp-apparmor"/>
+      <repopackage name="patterns-caasp-container-runtime"/>
       <repopackage name="patterns-caasp-hardware"/>
       <repopackage name="patterns-caasp-ima_evm"/>
       <repopackage name="patterns-caasp-MicroOS"/>
@@ -592,7 +593,6 @@
       <repopackage name="python-base"/>
       <repopackage name="python-base"/>
       <repopackage name="python-enum34"/>
-      <repopackage name="python-etcd"/>
       <repopackage name="python-gobject2"/>
       <repopackage name="python-ipaddress"/>
       <repopackage name="python-ipy"/>
@@ -610,7 +610,6 @@
       <repopackage name="python2-cryptography"/>
       <repopackage name="python2-dbus-python"/>
       <repopackage name="python2-decorator"/>
-      <repopackage name="python2-dnspython"/>
       <repopackage name="python2-gobject"/>
       <repopackage name="python2-gpgme"/>
       <repopackage name="python2-idna"/>
@@ -623,14 +622,12 @@
       <repopackage name="python2-pycurl"/>
       <repopackage name="python2-pyOpenSSL"/>
       <repopackage name="python2-pyparsing"/>
-      <repopackage name="python2-pyroute2"/>
       <repopackage name="python2-rpm"/>
       <repopackage name="python2-semanage"/>
       <repopackage name="python2-setuptools"/>
       <repopackage name="python2-six"/>
       <repopackage name="python2-six"/>
       <repopackage name="python2-typing"/>
-      <repopackage name="python2-urllib3"/>
       <repopackage name="python2-yum"/>
       <repopackage name="python3"/>
       <repopackage name="python3"/>
@@ -647,7 +644,9 @@
       <repopackage name="python3-chardet"/>
       <repopackage name="python3-configobj"/>
       <repopackage name="python3-cryptography"/>
+      <repopackage name="python3-dnspython"/>
       <repopackage name="python3-ecdsa"/>
+      <repopackage name="python3-etcd"/>
       <repopackage name="python3-idna"/>
       <repopackage name="python3-Jinja2"/>
       <repopackage name="python3-jsonpatch"/>
@@ -665,6 +664,7 @@
       <repopackage name="python3-pycrypto"/>
       <repopackage name="python3-PyJWT"/>
       <repopackage name="python3-pyparsing"/>
+      <repopackage name="python3-pyroute2"/>
       <repopackage name="python3-pyserial"/>
       <repopackage name="python3-pytz"/>
       <repopackage name="python3-PyYAML"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 4e5dc005..c11e9781 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -3561,7 +3561,7 @@
       <repopackage name="lifecycle-data-openSUSE" arch="i586,i686"/>
       <repopackage name="lightdm" arch="i586,i686"/>
       <repopackage name="lightdm-gtk-greeter" arch="i586,i686"/>
-      <repopackage name="lightdm-gtk-greeter-branding-openSUSE" arch="i586,i686"/>
+      <repopackage name="lightdm-gtk-greeter-branding-upstream" arch="i586,i686"/>
       <repopackage name="lightdm-gtk-greeter-lang" arch="i586,i686"/>
       <repopackage name="lightdm-lang" arch="i586,i686"/>
       <repopackage name="lightsoff" arch="i586,i686"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
index e0b42bb6..c0d467a8 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -3730,7 +3730,7 @@
       <repopackage name="lifecycle-data-openSUSE" arch="x86_64"/>
       <repopackage name="lightdm" arch="x86_64"/>
       <repopackage name="lightdm-gtk-greeter" arch="x86_64"/>
-      <repopackage name="lightdm-gtk-greeter-branding-openSUSE" arch="x86_64"/>
+      <repopackage name="lightdm-gtk-greeter-branding-upstream" arch="x86_64"/>
       <repopackage name="lightdm-gtk-greeter-lang" arch="x86_64"/>
       <repopackage name="lightdm-lang" arch="x86_64"/>
       <repopackage name="lightsoff" arch="x86_64"/>
diff --git a/openSUSE-Kubic.group b/openSUSE-Kubic.group
index 5155ed78..a00795e1 100644
--- a/openSUSE-Kubic.group
+++ b/openSUSE-Kubic.group
@@ -313,6 +313,7 @@
     <package name="parted"/>
     <package name="patterns-caasp-MicroOS"/>
     <package name="patterns-caasp-Stack"/>
+    <package name="patterns-caasp-container-runtime"/>
     <package name="pciutils"/>
     <package name="pciutils-ids"/>
     <package name="perl"/>
@@ -331,7 +332,6 @@
     <package name="python"/>
     <package name="python-base"/>
     <package name="python-enum34"/>
-    <package name="python-etcd"/>
     <package name="python-ipaddress"/>
     <package name="python-rpm-macros"/>
     <package name="python-xml"/>
@@ -340,18 +340,15 @@
     <package name="python2-asn1crypto"/>
     <package name="python2-cffi"/>
     <package name="python2-cryptography"/>
-    <package name="python2-dnspython"/>
     <package name="python2-idna"/>
     <package name="python2-packaging"/>
     <package name="python2-pyOpenSSL"/>
     <package name="python2-pyasn1"/>
     <package name="python2-pycparser"/>
     <package name="python2-pyparsing"/>
-    <package name="python2-pyroute2"/>
     <package name="python2-setuptools"/>
     <package name="python2-six"/>
     <package name="python2-typing"/>
-    <package name="python2-urllib3"/>
     <package name="python3"/>
     <package name="python3-Babel"/>
     <package name="python3-Jinja2"/>
@@ -369,7 +366,9 @@
     <package name="python3-chardet"/>
     <package name="python3-configobj"/>
     <package name="python3-cryptography"/>
+    <package name="python3-dnspython"/>
     <package name="python3-ecdsa"/>
+    <package name="python3-etcd"/>
     <package name="python3-idna"/>
     <package name="python3-jsonpatch"/>
     <package name="python3-jsonpointer"/>
@@ -383,6 +382,7 @@
     <package name="python3-pycparser"/>
     <package name="python3-pycrypto"/>
     <package name="python3-pyparsing"/>
+    <package name="python3-pyroute2"/>
     <package name="python3-pyserial"/>
     <package name="python3-pytz"/>
     <package name="python3-pyzmq"/>