diff --git a/debian-to-pbs.yml b/debian-to-pbs.yml
index 6493e8e..c9617f8 100644
--- a/debian-to-pbs.yml
+++ b/debian-to-pbs.yml
@@ -11,10 +11,9 @@
       when: ansible_facts["lsb"]["codename"] == "bullseye"
     - import_tasks: tasks/debian-general/repositories-bookworm.yml
       when: ansible_facts["lsb"]["codename"] == "bookworm"
+    - import_tasks: tasks/debian-general/repositories-trixie.yml
+      when: ansible_facts["lsb"]["codename"] == "trixie"
     - import_tasks: tasks/debian-general/upgrade.yml
-    - import_tasks: tasks/debian-to-pbs/repositories-bullseye.yml
-      when: ansible_facts["lsb"]["codename"] == "bullseye"
-    - import_tasks: tasks/debian-to-pbs/repositories-bookworm.yml
-      when: ansible_facts["lsb"]["codename"] == "bookworm"
+    - import_tasks: tasks/debian-to-pbs/repositories.yml
     - import_tasks: tasks/debian-general/upgrade.yml
     - import_tasks: tasks/debian-to-pbs/pbs-server.yml
diff --git a/tasks/debian-to-pbs/repositories-bookworm.yml b/tasks/debian-to-pbs/repositories-bookworm.yml
deleted file mode 100644
index 8f5431c..0000000
--- a/tasks/debian-to-pbs/repositories-bookworm.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Ensure the PBS Enterprise respository is disabled
-  ansible.builtin.copy:
-    dest: /etc/apt/sources.list.d/pbs-enterprise.list
-    content: |
-      #deb https://enterprise.proxmox.com/debian/pbs bookworm pbs-enterprise
-- name: Ensure the correct Proxmox repositories are in place
-  ansible.builtin.copy:
-    dest: /etc/apt/sources.list.d/pbs-no-subscription.list
-    content: |
-      deb http://download.proxmox.com/debian/pbs bookworm pbs-no-subscription
-- name: Ensure the Proxmox signing GPG key is present
-  ansible.builtin.get_url:
-    dest: /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
-    url: https://enterprise.proxmox.com/debian/proxmox-release-bookworm.gpg
diff --git a/tasks/debian-to-pbs/repositories-bullseye.yml b/tasks/debian-to-pbs/repositories-bullseye.yml
deleted file mode 100644
index 3a983b7..0000000
--- a/tasks/debian-to-pbs/repositories-bullseye.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Ensure the PBS Enterprise respository is disabled
-  ansible.builtin.copy:
-    dest: /etc/apt/sources.list.d/pbs-enterprise.list
-    content: |
-      #deb https://enterprise.proxmox.com/debian/pbs bullseye pbs-enterprise
-- name: Ensure the correct Proxmox repositories are in place
-  ansible.builtin.copy:
-    dest: /etc/apt/sources.list.d/pbs-no-subscription.list
-    content: |
-      deb http://download.proxmox.com/debian/pbs bullseye pbs-no-subscription
-- name: Ensure the Proxmox signing GPG key is present
-  ansible.builtin.get_url:
-    dest: /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
-    url: https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg
diff --git a/tasks/debian-to-pbs/repositories.yml b/tasks/debian-to-pbs/repositories.yml
new file mode 100644
index 0000000..fd9508a
--- /dev/null
+++ b/tasks/debian-to-pbs/repositories.yml
@@ -0,0 +1,15 @@
+---
+- name: Ensure the PBS Enterprise repository is disabled
+  ansible.builtin.copy:
+    dest: /etc/apt/sources.list.d/pbs-enterprise.list
+    content: |
+      #deb https://enterprise.proxmox.com/debian/pbs {{ ansible_facts.lsb.codename }} pbs-enterprise
+- name: Ensure the correct Proxmox repositories are in place
+  ansible.builtin.copy:
+    dest: /etc/apt/sources.list.d/pbs-no-subscription.list
+    content: |
+      deb http://download.proxmox.com/debian/pbs {{ ansible_facts.lsb.codename }} pbs-no-subscription
+- name: Ensure the Proxmox signing GPG key is present
+  ansible.builtin.get_url:
+    dest: /etc/apt/trusted.gpg.d/proxmox-release-{{ ansible_facts.lsb.codename }}.gpg
+    url: https://enterprise.proxmox.com/debian/proxmox-release-{{ ansible_facts.lsb.codename }}.gpg