diff --git a/MicroOS-dvd5-dvd-x86_64.kiwi b/MicroOS-dvd5-dvd-x86_64.kiwi
index c10c51cf..4180be03 100644
--- a/MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-dvd-x86_64.kiwi
@@ -1140,6 +1140,9 @@
       <repopackage name="open-lldp" arch="x86_64"/>
       <repopackage name="open-vm-tools" arch="x86_64"/>
       <repopackage name="openssh"/>
+      <repopackage name="openssh-clients"/>
+      <repopackage name="openssh-common"/>
+      <repopackage name="openssh-server"/>
       <repopackage name="openssl" arch="x86_64"/>
       <repopackage name="openssl-1_1" arch="x86_64"/>
       <repopackage name="openSUSE-build-key" arch="x86_64"/>
diff --git a/MicroOS-dvd5-kubic-dvd-x86_64.kiwi b/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
index 74ea8393..3803d8b9 100644
--- a/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
@@ -455,6 +455,9 @@
       <repopackage name="open-lldp" arch="x86_64"/>
       <repopackage name="open-vm-tools" arch="x86_64"/>
       <repopackage name="openssh"/>
+      <repopackage name="openssh-clients"/>
+      <repopackage name="openssh-common"/>
+      <repopackage name="openssh-server"/>
       <repopackage name="openssl" arch="x86_64"/>
       <repopackage name="openssl-1_1" arch="x86_64"/>
       <repopackage name="openSUSE-build-key" arch="x86_64"/>
diff --git a/dvd.group b/dvd.group
index 40c74511..1d8f5f1e 100644
--- a/dvd.group
+++ b/dvd.group
@@ -643,6 +643,7 @@
     <package name="git-daemon" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="git-email" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="git-gui" supportstatus="unsupported"/> <!-- reason: dvd:git -->
+    <package name="git-svn" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="git-web" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="gitg" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="gitg-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
@@ -3291,7 +3292,9 @@
     <package name="openslp-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="openssh" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="openssh-askpass-gnome" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="openssh-helpers" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="openssh-clients" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="openssh-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="openssh-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="openssl" supportstatus="unsupported"/> <!-- reason: dvd:mokutil -->
     <package name="openssl-1_1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="opensuse-welcome" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -4599,6 +4602,7 @@
     <package name="subversion" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="subversion-bash-completion" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="subversion-doc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="subversion-perl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="subversion-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="subversion-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="sudo" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5342,7 +5346,6 @@
     <package name="efibootmgr" supportstatus="unsupported"/> <!-- reason: dvd:grub2-x86_64-efi -->
     <package name="fprintd-pam-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="gdk-pixbuf-query-loaders-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="git-svn" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="glibc-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="gnome-keyring-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="gnome-keyring-pam-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -5566,7 +5569,6 @@
     <package name="shim" supportstatus="unsupported"/> <!-- reason: dvd:shim -->
     <package name="skopeo" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="sssd-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="subversion-perl" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="supermin" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="systemd-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="virt-sandbox" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 3d057e18..971fdb1c 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -645,6 +645,7 @@
       <repopackage name="git-daemon"/>
       <repopackage name="git-email"/>
       <repopackage name="git-gui"/>
+      <repopackage name="git-svn"/>
       <repopackage name="git-web"/>
       <repopackage name="gitg"/>
       <repopackage name="gitg-lang"/>
@@ -3335,7 +3336,9 @@
       <repopackage name="openslp-server"/>
       <repopackage name="openssh"/>
       <repopackage name="openssh-askpass-gnome"/>
-      <repopackage name="openssh-helpers"/>
+      <repopackage name="openssh-clients"/>
+      <repopackage name="openssh-common"/>
+      <repopackage name="openssh-server"/>
       <repopackage name="openssl"/>
       <repopackage name="openssl-1_1"/>
       <repopackage name="openSUSE-build-key"/>
@@ -4654,6 +4657,7 @@
       <repopackage name="subversion"/>
       <repopackage name="subversion-bash-completion"/>
       <repopackage name="subversion-doc"/>
+      <repopackage name="subversion-perl"/>
       <repopackage name="subversion-server"/>
       <repopackage name="subversion-tools"/>
       <repopackage name="sudo"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index c026afac..c2f5a55c 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -662,7 +662,7 @@
       <repopackage name="git-daemon"/>
       <repopackage name="git-email"/>
       <repopackage name="git-gui"/>
-      <repopackage name="git-svn" arch="x86_64"/>
+      <repopackage name="git-svn"/>
       <repopackage name="git-web"/>
       <repopackage name="gitg"/>
       <repopackage name="gitg-lang"/>
@@ -3530,7 +3530,9 @@
       <repopackage name="openslp-server"/>
       <repopackage name="openssh"/>
       <repopackage name="openssh-askpass-gnome"/>
-      <repopackage name="openssh-helpers"/>
+      <repopackage name="openssh-clients"/>
+      <repopackage name="openssh-common"/>
+      <repopackage name="openssh-server"/>
       <repopackage name="openssl"/>
       <repopackage name="openssl-1_1"/>
       <repopackage name="openSUSE-build-key"/>
@@ -4890,7 +4892,7 @@
       <repopackage name="subversion"/>
       <repopackage name="subversion-bash-completion"/>
       <repopackage name="subversion-doc"/>
-      <repopackage name="subversion-perl" arch="x86_64"/>
+      <repopackage name="subversion-perl"/>
       <repopackage name="subversion-server"/>
       <repopackage name="subversion-tools"/>
       <repopackage name="sudo"/>
diff --git a/opensuse_kubic.group b/opensuse_kubic.group
index f9d04e40..57dd84c4 100644
--- a/opensuse_kubic.group
+++ b/opensuse_kubic.group
@@ -109,6 +109,9 @@
     <package name="ncurses-utils" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="netcfg" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="openssh" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
+    <package name="openssh-clients" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
+    <package name="openssh-common" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
+    <package name="openssh-server" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="pam" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="pam-config" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="perl-Bootloader" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
diff --git a/opensuse_microos.group b/opensuse_microos.group
index d524d8d1..f5b8b153 100644
--- a/opensuse_microos.group
+++ b/opensuse_microos.group
@@ -109,6 +109,9 @@
     <package name="ncurses-utils" supportstatus="unsupported"/> <!-- reason: opensuse_microos:kernel-default -->
     <package name="netcfg" supportstatus="unsupported"/> <!-- reason: opensuse_microos:kernel-default -->
     <package name="openssh" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
+    <package name="openssh-clients" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
+    <package name="openssh-common" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
+    <package name="openssh-server" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
     <package name="pam" supportstatus="unsupported"/> <!-- reason: opensuse_microos:kernel-default -->
     <package name="pam-config" supportstatus="unsupported"/> <!-- reason: opensuse_microos:kernel-default -->
     <package name="perl-Bootloader" supportstatus="unsupported"/> <!-- reason: opensuse_microos:kernel-default -->
diff --git a/unsorted.yml b/unsorted.yml
index f94177f1..1018397c 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -1179,9 +1179,7 @@ unsorted:
   - binutils-gold 
   - binwalk 
   - bird 
-  - bird-common 
   - bird-doc 
-  - bird6 
   - bison-32bit: [x86_64] 
   - bitcoin-qt5 
   - bitcoin-test 
@@ -4993,7 +4991,6 @@ unsorted:
   - git-subrepo 
   - git-subrepo-bash-completion 
   - git-subrepo-zsh-completion 
-  - git-svn: [i586] 
   - git-sync 
   - git-test 
   - gitolite 
@@ -5513,6 +5510,7 @@ unsorted:
   - gr-fcdproplus 
   - gr-fcdproplus-devel-doc 
   - gr-iqbal-devel-doc 
+  - gr-iqbal-grc 
   - grabpng 
   - gradio 
   - gradio-lang 
@@ -10082,7 +10080,7 @@ unsorted:
   - libgnuradio-fcdproplus-devel 
   - libgnuradio-fcdproplus3_8_0 
   - libgnuradio-iqbalance-devel 
-  - libgnuradio-iqbalance0_37_2git 
+  - libgnuradio-iqbalance3_8_0 
   - libgnutls-dane-devel 
   - libgnutls-dane0: [i586] 
   - libgnutls-devel 
@@ -11240,6 +11238,8 @@ unsorted:
   - libnanomsg5 
   - libnautilus-extension1-32bit: [x86_64] 
   - libnauty-2_7_1 
+  - libnbcompat-devel 
+  - libnbcompat0 
   - libncurses5 
   - libncurses5-32bit: [x86_64] 
   - libncurses6-32bit: [x86_64] 
@@ -13032,6 +13032,7 @@ unsorted:
   - libtorrent-rasterbar-devel 
   - libtorrent-rasterbar-doc 
   - libtorrent-rasterbar10 
+  - libtorrent-rasterbar2_0 
   - libtorrent21 
   - libtotem_pg5 
   - libtotem_pg5-32bit: [x86_64] 
@@ -16842,6 +16843,7 @@ unsorted:
   - openspecfun-devel 
   - openssh-cavs 
   - openssh-fips 
+  - openssh-helpers 
   - openssl-1_0_0 
   - openssl-1_0_0-cavs 
   - openssl-1_0_0-doc 
@@ -25883,7 +25885,6 @@ unsorted:
   - subunit-filters 
   - subunit-shell 
   - subversion-devel 
-  - subversion-perl: [i586] 
   - subversion-python 
   - subversion-ruby 
   - suck