diff --git a/plex/pmm/collections/Movies/Movies_Collections_In_Memoriam.yml b/plex/pmm/collections/Movies/Movies_Collections_In_Memoriam.yml
index 66498b5..402adcf 100644
--- a/plex/pmm/collections/Movies/Movies_Collections_In_Memoriam.yml
+++ b/plex/pmm/collections/Movies/Movies_Collections_In_Memoriam.yml
@@ -1,7 +1,7 @@
 # In Memoriam collections for the Movies section
 
 templates:
-  Person:
+  Actor:
     default:
       level: ""
     tmdb_person: <<tmdb_id>>
@@ -9,9 +9,19 @@ templates:
       sort_by: release.desc
       any:
         actor: tmdb
+      sort_title: <<level>>+02_<<collection_name>>
+      sync_mode: append
+    visible_library: true
+    visible_shared: true
+    visible_home: true
+  Director:
+    default:
+      level: ""
+    tmdb_person: <<tmdb_id>>
+    smart_filter:
+      sort_by: release.desc
+      any:
         director: tmdb
-        producer: tmdb
-        writer: tmdb
       sort_title: <<level>>+02_<<collection_name>>
       sync_mode: append
     visible_library: true
@@ -20,6 +30,6 @@ templates:
     
 collections:
   "#JusticeForJohnny":
-    template: { name: Person, tmdb_id: 85 }
+    template: { name: Actor, tmdb_id: 85 }
 
 
diff --git a/plex/pmm/collections/TVShows/TV_Shows_Collections_In_Memoriam.yml b/plex/pmm/collections/TVShows/TV_Shows_Collections_In_Memoriam.yml
index 5d1159b..47c25df 100644
--- a/plex/pmm/collections/TVShows/TV_Shows_Collections_In_Memoriam.yml
+++ b/plex/pmm/collections/TVShows/TV_Shows_Collections_In_Memoriam.yml
@@ -1,7 +1,7 @@
 # In Memoriam collections for the TV Shows section
 
 templates:
-  Person:
+  Actor:
     default:
       level: ""
     tmdb_person: <<tmdb_id>>
@@ -9,9 +9,19 @@ templates:
       sort_by: release.desc
       any:
         actor: tmdb
+      sort_title: <<level>>+02_<<collection_name>>
+      sync_mode: append
+    visible_library: true
+    visible_shared: true
+    visible_home: true
+  Director:
+    default:
+      level: ""
+    tmdb_person: <<tmdb_id>>
+    smart_filter:
+      sort_by: release.desc
+      any:
         director: tmdb
-        producer: tmdb
-        writer: tmdb
       sort_title: <<level>>+02_<<collection_name>>
       sync_mode: append
     visible_library: true