diff --git a/roles/jellyfin/files/jellyfin-defaults b/roles/any.software.jellyfin/files/jellyfin-defaults
similarity index 100%
rename from roles/jellyfin/files/jellyfin-defaults
rename to roles/any.software.jellyfin/files/jellyfin-defaults
diff --git a/roles/jellyfin/files/jellyfin.Caddyfile b/roles/any.software.jellyfin/files/jellyfin.Caddyfile
similarity index 100%
rename from roles/jellyfin/files/jellyfin.Caddyfile
rename to roles/any.software.jellyfin/files/jellyfin.Caddyfile
diff --git a/roles/jellyfin/files/jellyfin.service.conf b/roles/any.software.jellyfin/files/jellyfin.service.conf
similarity index 98%
rename from roles/jellyfin/files/jellyfin.service.conf
rename to roles/any.software.jellyfin/files/jellyfin.service.conf
index 0367a9e..8d29d28 100644
--- a/roles/jellyfin/files/jellyfin.service.conf
+++ b/roles/any.software.jellyfin/files/jellyfin.service.conf
@@ -7,7 +7,7 @@
 User = jellyfin
 
 # Alter where environment variables are sourced from
-#EnvironmentFile = /etc/default/jellyfin
+EnvironmentFile = /etc/default/jellyfin
 
 # These *should* prevent Jellyfin from fully consuming my Pi's resources
 CPUQuota=300%
diff --git a/roles/jellyfin/handlers/main.yml b/roles/any.software.jellyfin/handlers/main.yml
similarity index 81%
rename from roles/jellyfin/handlers/main.yml
rename to roles/any.software.jellyfin/handlers/main.yml
index 8573d40..b9f6e4c 100644
--- a/roles/jellyfin/handlers/main.yml
+++ b/roles/any.software.jellyfin/handlers/main.yml
@@ -3,7 +3,7 @@
   systemd:
     daemon_reload: true
 
-- name: restart-jellyfin
+- name: restart jellyfin
   service:
     name: jellyfin
     state: restarted
diff --git a/roles/any.software.jellyfin/meta/main.yml b/roles/any.software.jellyfin/meta/main.yml
new file mode 100644
index 0000000..d620a12
--- /dev/null
+++ b/roles/any.software.jellyfin/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - role: any.tools.caddy
diff --git a/roles/jellyfin/tasks/main.yml b/roles/any.software.jellyfin/tasks/main.yml
similarity index 69%
rename from roles/jellyfin/tasks/main.yml
rename to roles/any.software.jellyfin/tasks/main.yml
index 7ac1304..98320be 100644
--- a/roles/jellyfin/tasks/main.yml
+++ b/roles/any.software.jellyfin/tasks/main.yml
@@ -1,13 +1,12 @@
-- name: Add Jellyfin GPG key
-  apt_key:
-    url: "https://repo.jellyfin.org/debian/jellyfin_team.gpg.key"
-    state: present
-
-- name: Add Jellyfin repository
-  apt_repository:
-    repo: "deb https://repo.jellyfin.org/debian bookworm main"
-    filename: 'jellyfin'
-    state: present
+- name: Add Jellyfin repository and key
+  ansible.builtin.deb822_repository:
+    name: 'jellyfin'
+    types: 
+      - deb
+    uris: 'https://repo.jellyfin.org/debian'
+    suites: 'trixie'
+    components: 'main'
+    signed_by: 'https://repo.jellyfin.org/debian/jellyfin_team.gpg.key'
 
 - name: Install Jellyfin
   apt:
@@ -17,8 +16,8 @@
 - name: Create Jellyfin user
   user:
     name: jellyfin
-    groups:
-      - data
+    # groups:
+    #   - data
     append: true
     create_home: no
     shell: /bin/nologin
@@ -33,7 +32,7 @@
     mode: '644'
   notify: 
     - daemon-reload
-    - restart-jellyfin
+    - restart jellyfin
 
 - name: Copy over Environment file
   copy:
@@ -42,7 +41,7 @@
     owner: root
     group: root
     mode: '644'
-  notify: restart-jellyfin
+  notify: restart jellyfin
 
 - name: Ensure Jellyfin service is running & enabled
   service:
@@ -57,4 +56,4 @@
     owner: root
     group: root
     mode: '0644'
-  notify: caddy-reload
+  notify: reload caddy
diff --git a/roles/jellyfin/meta/main.yml b/roles/jellyfin/meta/main.yml
deleted file mode 100644
index 1dbd0f6..0000000
--- a/roles/jellyfin/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-  - role: caddy