diff --git a/ansible/roles/recyclarr/templates/radarr.yml b/ansible/roles/recyclarr/templates/radarr.yml
new file mode 100644
index 0000000..da9f261
--- /dev/null
+++ b/ansible/roles/recyclarr/templates/radarr.yml
@@ -0,0 +1,13 @@
+radarr:
+  movies:
+    base_url: "https://radarr.local.{{ personal_domain }}"
+    api_key: "{{ radarr_api_key }"
+    delete_old_custom_formats: true
+    replace_existing_custom_formats: true
+    quality_definition:
+      type: movie
+    media_naming:
+      folder: jellyfin-tmdb
+      movie:
+        rename: true
+        standard: default
diff --git a/ansible/roles/recyclarr/templates/recyclarr.yml b/ansible/roles/recyclarr/templates/recyclarr.yml
deleted file mode 100644
index 0a8d1ff..0000000
--- a/ansible/roles/recyclarr/templates/recyclarr.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-sonarr:
-  series:
-    base_url: "https://sonarr.local.{{ personal_domain }}"
-    api_key: "{{ sonarr_api_key }}"
-    delete_old_custom_formats: true
-    quality_definition:
-      type: series
-    media_naming:
-      series: plex
-      season: default
-      episodes:
-        rename: true
-        standard: default
-        daily: default
-        anime: default
-    include:
-      # Remux Quality Profile
-      - config: includes/qualities/sonarr-remux-qualities.yml
-      - config: includes/sonarr-remux.yml
-      # Web Quality Profile
-      - config: includes/qualities/sonarr-web-qualities.yml
-      - config: includes/sonarr-web.yml
-      # Season Pack Profile
-      - config: includes/qualities/sonarr-seasonpack-qualities.yml
-      - config: includes/sonarr-seasonpack.yml
-      # Anime Quality Profile
-      - config: includes/qualities/sonarr-anime-qualities.yml
-      - config: includes/sonarr-anime.yml
-
-
-radarr:
-  movies:
-    base_url: "https://radarr.local.{{ personal_domain }}"
-    api_key: "{{ radarr_api_key }}"
-    delete_old_custom_formats: true
-    quality_definition:
-      type: movie
-    media_naming:
-      folder: plex
-      movie:
-        rename: true
-        standard: anime
-    include:
-      # Remux Quality Profile
-      - config: includes/qualities/radarr-remux-qualities.yml
-      - config: includes/radarr-remux.yml
-      # Web Quality Profile
-      - config: includes/qualities/radarr-web-qualities.yml
-      - config: includes/radarr-web.yml
-      # Anime Quality Profile
-      - config: includes/qualities/radarr-anime-qualities.yml
-      - config: includes/radarr-anime.yml
-      # Not 4k Quality Profile
-      - config: includes/qualities/radarr-not4k-qualities.yml
-      - config: includes/radarr-not4k.yml
-
diff --git a/ansible/roles/recyclarr/templates/sonarr.yml b/ansible/roles/recyclarr/templates/sonarr.yml
new file mode 100644
index 0000000..d800abd
--- /dev/null
+++ b/ansible/roles/recyclarr/templates/sonarr.yml
@@ -0,0 +1,16 @@
+sonarr:
+  tv:
+    base_url: "https://sonarr.local.{{ personal_domain }}"
+    api_key: "{{ sonarr_api_key }}"
+    delete_old_custom_formats: true
+    replace_existing_custom_formats: true
+    quality_definition:
+      type: anime
+    media_naming:
+      series: jellyfin-tvdb
+      season: default
+      episodes:
+        rename: true
+        standard: default
+        daily: default
+        anime: default