diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp
index 12e2383..319e49f 100644
--- a/modules/rhizo_base/manifests/packages.pp
+++ b/modules/rhizo_base/manifests/packages.pp
@@ -20,12 +20,12 @@ class rhizo_base::packages::common {
 
   package { ['sngrep', 'tcpdump', 'sudo', 'curl', 'screen', 'tzdata', 'file', 'git',
              'bzip2', 'unzip', 'gdb', 'cron', 'gzip', 'iproute2', 'psmisc', 'dpkg', 'apt',
-             'vim-common', 'vim-tiny', 'xxd', ]:
+             'vim-common', 'vim-tiny', 'xxd', 'rsync', 'pkg-config']:
       ensure => latest,
       require => Class['rhizo_base::apt'],
   }
 
-  package { [ 'libc-ares2', 'libc-bin', 'bind9-host', 'rsyslog', 'facter' ]:
+  package { [ 'libc-ares2', 'libc-bin', 'bind9-host', 'rsyslog', 'facter', 'libicu-dev' ]:
       ensure  => latest,
       require => Class['rhizo_base::apt'],
   }
@@ -34,14 +34,17 @@ class rhizo_base::packages::common {
             'libffi-dev', 'apcupsd', 'expect', 'gawk', 'swig', 'g++', 'tinc',
             'rrdtool', 'dnsmasq', 'joe', 'htop', 'iperf3', 'iftop',
             'websocketd', 'fping', 'mtr-tiny', 'openssh-server', 'telnet', 'netcat-traditional',
-            'python-unidecode', 'python-dateutil', 'python-yaml', 'python-formencode',
-            'python-smpplib', 'python-psycopg2', 'python-pysqlite2', 'rsync', 'pkg-config', 'libicu-dev',
             'apache2','libapache2-mod-php', 'php', 'php-pgsql', 'php-curl', 'php-cli', 'php-gd',
-            'php-intl', 'php-gettext' ]:
+            'php-intl', 'php-gettext']:
       ensure  => installed,
       require => Class['rhizo_base::apt'],
     }
 
+  package { [ 'python-smpplib' ]:
+      ensure  => installed,
+      require => Class['rhizo_base::apt'],
+  }
+
   package { [ 'collectd', 'libxml2-utils' ]:
       ensure          => 'installed',
       install_options => ['--no-install-recommends'],
@@ -54,11 +57,23 @@ class rhizo_base::packages::common {
 
 }
 
-class rhizo_base::packages::bullseye inherits rhizo_base::packages::buster {
+class rhizo_base::packages::bullseye inherits rhizo_base::packages::common {
+
+  package { ['python3-unidecode', 'python3-dateutil', 'python3-yaml', 'python3-formencode',
+            'python3-xmltodict', 'python3-psycopg2', 'python3-aiosqlite', 'python3-pip' ]:
+      ensure  => installed,
+      require => Class['rhizo_base::apt'],
+    }
 }
 
 class rhizo_base::packages::buster inherits rhizo_base::packages::common {
 
+  package { ['python-unidecode', 'python-dateutil', 'python-yaml', 'python-formencode',
+            'python-xmltodict', 'python-psycopg2', 'python-pysqlite2' ]:
+      ensure  => installed,
+      require => Class['rhizo_base::apt'],
+    }
+
   package { ['libcdk5nc6', 'msmtp-mta', 'ncat' ]:
       ensure  => installed,
       require => Class['rhizo_base::apt'],
@@ -89,6 +104,12 @@ class rhizo_base::packages::buster inherits rhizo_base::packages::common {
 
 class rhizo_base::packages::stretch inherits rhizo_base::packages::common {
 
+  package { ['python-unidecode', 'python-dateutil', 'python-yaml', 'python-formencode',
+            'python-xmltodict', 'python-psycopg2', 'python-pysqlite2' ]:
+      ensure  => installed,
+      require => Class['rhizo_base::apt'],
+    }
+
   package { ['libcdk5', 'nmap' ]:
       ensure  => installed,
       require => Class['rhizo_base::apt'],