diff --git a/modules/rhizo_base/manifests/kiwi.pp b/modules/rhizo_base/manifests/kiwi.pp
index 7ecb2ab..42ac3bc 100644
--- a/modules/rhizo_base/manifests/kiwi.pp
+++ b/modules/rhizo_base/manifests/kiwi.pp
@@ -15,11 +15,20 @@ class rhizo_base::kiwi {
   $site_name     = $rhizo_base::site_name
 
   package {
-    ['make', 'npm']:
+    ['make']:
       ensure  => installed,
       require => Class['rhizo_base::apt'],
     }
 
+  if ($lsbdistcodename == 'buster') {
+
+    package {
+      [ 'npm']:
+        ensure  => installed,
+        require => Class['rhizo_base::apt'],
+      }
+  }
+
   package {
     ['nodejs']:
       ensure  => $lsbdistcodename ? {
diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp
index 74337eb..dbc50cb 100644
--- a/modules/rhizo_base/manifests/packages.pp
+++ b/modules/rhizo_base/manifests/packages.pp
@@ -11,14 +11,23 @@
 # Sample Usage:
 #
 class rhizo_base::packages {
-  contain "rhizo_base::packages::$operatingsystem"
+  contain "rhizo_base::packages::$lsbdistcodename"
 }
 
 class rhizo_base::packages::common {
 
+  include stdlib
+
+  package { ['apache2','libapache2-mod-php', 'php', 'php-pgsql',
+             'php-curl', 'php-cli', 'php-gd', 'php-intl', 'php-gettext',
+             'sudo']:
+      ensure  => installed,
+      require => Class['rhizo_base::apt'],
+  }
+
   package { ['mosh', 'tmux', 'git', 'openvpn', 'lm-sensors', 'runit-systemd', 'sqlite3',
             'libffi-dev', 'apcupsd', 'expect', 'gawk', 'swig', 'g++', 'tinc', 'tcpdump',
-            'libcdk5' , 'sngrep', 'rrdtool', 'dnsmasq', 'joe', 'curl', 'htop', 'screen',
+            'sngrep', 'rrdtool', 'dnsmasq', 'joe', 'curl', 'htop', 'screen',
             'websocketd', 'fping', 'mtr-tiny', 'openssh-server', 'telnet', 'netcat-traditional',
             'python-unidecode', 'python-dateutil', 'python-yaml', 'python-formencode',
             'python-smpplib', 'python-psycopg2', 'python-pysqlite2' ]:
@@ -27,56 +36,35 @@ class rhizo_base::packages::common {
     }
 }
 
-class rhizo_base::packages::ubuntu inherits rhizo_base::packages::common {
+class rhizo_base::packages::buster inherits rhizo_base::packages::common {
 
-  package { ['puppet', 'puppet-common']:
-      ensure  => '3.8.1-1puppetlabs1',
-    }
-
-#Apache2 + PHP
-  package { ['apache2','libapache2-mod-php5.6', 'php5.6', 'php5.6-pgsql',
-  'php5.6-curl', 'php5.6-cli', 'php5.6-gd', 'php5.6-xml',
-  'python-corepost', 'python-twisted-web' ]:
+  package { ['libcdk5nc6' ]:
       ensure  => installed,
       require => Class['rhizo_base::apt'],
     }
 
-  file { '/etc/php/5.6/apache2/php.ini':
-      ensure  => present,
-      source  => "puppet:///modules/rhizo_base/etc/php5/apache2/php.ini.$operatingsystem"
-    }
-
-
-}
-
-class rhizo_base::packages::debian inherits rhizo_base::packages::common {
-
-  include stdlib
-
-  package { ['apache2','libapache2-mod-php', 'php', 'php-pgsql',
-  'php-curl', 'php-cli', 'php-gd', 'php-intl', 'php-gettext',
-  'sudo']:
-      ensure  => installed,
-      require => Class['rhizo_base::apt'],
-    }
-
-
-  if ($lsbdistcodename == 'buster') {
-    # FIXME: An Apache restart is required after this change.
-    file_line { 'apache_php':
-      ensure             => present,
-      path               => '/etc/php/7.3/apache2/php.ini',
-      line               => 'short_open_tag = On',
-      match              => '^short_open_tag',
-      append_on_no_match => false,
-    }
-
-  } else {
-
-    file { '/etc/php/7.0/apache2/php.ini':
-        ensure  => present,
-        source  => "puppet:///modules/rhizo_base/php.ini",
-        require => Package['libapache2-mod-php']
-      }
+  # FIXME: An Apache restart is required after this change.
+  file_line { 'apache_php':
+    ensure             => present,
+    path               => '/etc/php/7.3/apache2/php.ini',
+    line               => 'short_open_tag = On',
+    match              => '^short_open_tag',
+    append_on_no_match => false,
   }
+
+}
+
+class rhizo_base::packages::stretch inherits rhizo_base::packages::common {
+
+  package { ['libcdk5' ]:
+      ensure  => installed,
+      require => Class['rhizo_base::apt'],
+    }
+
+  file { '/etc/php/7.0/apache2/php.ini':
+      ensure  => present,
+      source  => "puppet:///modules/rhizo_base/php.ini",
+      require => Package['libapache2-mod-php']
+    }
+
 }