diff --git a/modules/ocf/manifests/apt.pp b/modules/ocf/manifests/apt.pp
index d4e12f06e..36508ac54 100644
--- a/modules/ocf/manifests/apt.pp
+++ b/modules/ocf/manifests/apt.pp
@@ -12,7 +12,62 @@
   $repos = 'main contrib non-free'
 
   if $::lsbdistid == 'Debian' {
-      if $::operatingsystemmajrelease != '11' {
+      if $::operatingsystemmajrelease == 'bookworm/sid' {
+        apt::source {
+        'debian':
+            location => 'http://mirrors/debian/',
+            release  => $::lsbdistcodename,
+            repos    => $repos,
+            include  => {
+            src => true
+            };
+
+        'debian-updates':
+            location => 'http://mirrors/debian/',
+            release  => "${::lsbdistcodename}-updates",
+            repos    => $repos,
+            include  => {
+            src => true
+            };
+
+        'debian-security':
+            location => 'http://mirrors/debian-security/',
+            release  => "${::lsbdistcodename}-security",
+            repos    => $repos,
+            include  => {
+            src => true
+            };
+
+        'ocf':
+            location => 'http://apt/',
+            release  => 'buster',
+            repos    => 'main',
+            include  => {
+            src => true
+            };
+
+        'ocf-backports':
+            location => 'http://apt/',
+            release  => 'buster-backports',
+            repos    => 'main',
+            include  => {
+            src => true
+            };
+        }
+
+        # Pin anything coming from *-backports to be lower than normal priority
+        apt::pin { 'ocf-backports':
+        priority => 200,
+        codename => "${::lsbdistcodename}-backports",
+        }
+
+        # TODO: Submit patch to puppetlabs-apt to enable having includes for
+        # apt::backports (so that we can include the source too)
+        class { 'apt::backports':
+        location => 'http://mirrors/debian/';
+        }
+    }
+    elsif $::operatingsystemmajrelease != '11' {
         apt::source {
         'debian':
             location => 'http://mirrors/debian/',
@@ -147,7 +202,7 @@
   apt::source {
     'puppetlabs':
       location => 'http://mirrors/puppetlabs/apt/',
-      release  => $::lsbdistcodename,
+      release  => 'bullseye',
       repos    => 'puppet',
   }
 
diff --git a/modules/ocf/manifests/packages/powershell/apt.pp b/modules/ocf/manifests/packages/powershell/apt.pp
index 04bf69e85..620b31085 100644
--- a/modules/ocf/manifests/packages/powershell/apt.pp
+++ b/modules/ocf/manifests/packages/powershell/apt.pp
@@ -15,8 +15,8 @@
   } else {
     apt::source { 'powershell':
       architecture => 'amd64',
-      location     => "https://packages.microsoft.com/debian/${::operatingsystemmajrelease}/prod",
-      release      => $::lsbdistcodename,
+      location     => "https://packages.microsoft.com/debian/11/prod",
+      release      => 'bullseye',
       repos        => 'main',
       require      => Apt::Key['powershell repo key'],
     }
diff --git a/modules/ocf_desktop/manifests/packages.pp b/modules/ocf_desktop/manifests/packages.pp
index d39cfaa07..0cef6d539 100644
--- a/modules/ocf_desktop/manifests/packages.pp
+++ b/modules/ocf_desktop/manifests/packages.pp
@@ -103,6 +103,23 @@
       ]:;
     }
   }
+  if $::lsbdistcodename == 'bookworm' {
+    package {
+      [
+        # OpenJDK 17 (LTS) is in bullseye
+        'openjdk-17-jdk',
+
+        # Matchbox is what we use on our RPi
+        'matchbox-keyboard',
+
+        # x4vncviewer is no longer present
+        'tigervnc-viewer',
+
+        # sshfs depends on fuse3 on bullseye
+        'fuse3',
+      ]:;
+    }
+  }
 
   # Remove some packages
   package {