diff --git a/tasks/install_x86_64.yml b/tasks/install_x86_64.yml
index cf54de4..3ab2ad2 100644
--- a/tasks/install_x86_64.yml
+++ b/tasks/install_x86_64.yml
@@ -1,15 +1,23 @@
 ---
-- name: Ensure Puppet repository is installed
+- name: Ensure Puppet repository is installed (LTS Ubuntu or Debian)
   apt:
     deb: "https://apt.puppetlabs.com/puppet{{ puppet_version }}-release-{{ ansible_distribution_release }}.deb"
   when:
-    - ansible_facts['distribution_release'] not in ['groovy', 'hirsute']
+    - ansible_facts['distribution_release'] not in ['groovy', 'hirsute', 'bookworm']
 
-- name: Ensure Puppet repository is installed
+- name: Ensure Puppet repository is installed (Ubuntu not LTS)
   apt:
     deb: "https://apt.puppetlabs.com/puppet{{ puppet_version }}-release-focal.deb"
   when:
-    - ansible_facts['distribution_release'] in ['groovy', 'hirsute']
+    - ansible_facts['distribution'] != 'Debian'
+    - ansible_facts['distribution_release'] in ['groovy', 'hirsute', 'lunar', 'maniac']
+
+- name: Ensure Puppet repository is installed (Debian Bookworm)
+  apt:
+    deb: "https://apt.puppetlabs.com/puppet{{ puppet_version }}-release-bullseye.deb"
+  when:
+    - ansible_facts['distribution'] == 'Debian'
+    - ansible_facts['distribution_release'] in ['bookworm']
 
 - name: Ensure puppet-agent is installed
   package: