diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp
index 2fe0b6a..45b7887 100644
--- a/modules/rhizo_base/manifests/apt.pp
+++ b/modules/rhizo_base/manifests/apt.pp
@@ -20,6 +20,7 @@ class rhizo_base::apt::common {
   $osmo_repo  = hiera('rhizo::osmo_repo', 'latest')
 
   $fs_version = "${lsbdistcodename}" ? {
+    'bullseye' =>  '1.8.6',
     'buster'   =>  '1.8.6',
     'stretch'  =>  '1.6.20',
   }
@@ -79,6 +80,9 @@ class rhizo_base::apt::common {
     }
 }
 
+class rhizo_base::apt::bullseye inherits rhizo_base::apt::buster {
+}
+
 class rhizo_base::apt::buster inherits rhizo_base::apt::common {
 
   apt::source { 'irontec':
diff --git a/modules/rhizo_base/manifests/freeswitch.pp b/modules/rhizo_base/manifests/freeswitch.pp
index c0af790..3838f48 100644
--- a/modules/rhizo_base/manifests/freeswitch.pp
+++ b/modules/rhizo_base/manifests/freeswitch.pp
@@ -121,6 +121,7 @@ class rhizo_base::freeswitch::common {
   $upstream_codec  = $rhizo_base::upstream_codec
 
   $fs_version = "${lsbdistcodename}" ? {
+    'bullseye' =>  '1.8.6',
     'buster'   =>  '1.8.6',
     'stretch'  =>  '1.6.20',
   }
diff --git a/modules/rhizo_base/manifests/kiwi.pp b/modules/rhizo_base/manifests/kiwi.pp
index 224f744..1ddbffa 100644
--- a/modules/rhizo_base/manifests/kiwi.pp
+++ b/modules/rhizo_base/manifests/kiwi.pp
@@ -32,8 +32,9 @@ class rhizo_base::kiwi {
   package {
     ['nodejs']:
       ensure  => $lsbdistcodename ? {
-        "stretch" => '0.10.48-1nodesource1~jessie1',
-        "buster" => '10.24.0~dfsg-1~deb10u2',
+        "stretch"  => '0.10.48-1nodesource1~jessie1',
+        "buster"   => '10.24.0~dfsg-1~deb10u2',
+        "bullseye"=>  "12.22.5~dfsg-2~11u1"
       	},
       require => Class['rhizo_base::apt'],
     }
diff --git a/modules/rhizo_base/manifests/osmocom.pp b/modules/rhizo_base/manifests/osmocom.pp
index 2971939..e3ebf81 100644
--- a/modules/rhizo_base/manifests/osmocom.pp
+++ b/modules/rhizo_base/manifests/osmocom.pp
@@ -11,6 +11,9 @@ class rhizo_base::osmocom {
   contain "rhizo_base::osmocom::$lsbdistcodename"
 }
 
+class rhizo_base::osmocom::bullseye inherits rhizo_base::osmocom::buster {
+}
+
 class rhizo_base::osmocom::buster inherits rhizo_base::osmocom::common {
 
   package {  [ "osmocom-$repo" ]:
diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp
index df75a95..12e2383 100644
--- a/modules/rhizo_base/manifests/packages.pp
+++ b/modules/rhizo_base/manifests/packages.pp
@@ -54,6 +54,9 @@ class rhizo_base::packages::common {
 
 }
 
+class rhizo_base::packages::bullseye inherits rhizo_base::packages::buster {
+}
+
 class rhizo_base::packages::buster inherits rhizo_base::packages::common {
 
   package { ['libcdk5nc6', 'msmtp-mta', 'ncat' ]: