diff --git a/Template/Stack/rr_mtm.yml b/Template/Stack/rr_mtm.yml
index f565b84..0835fa4 100644
--- a/Template/Stack/rr_mtm.yml
+++ b/Template/Stack/rr_mtm.yml
@@ -2,7 +2,7 @@
 version: "3.7"
 services:
   lidarr:
-    container_name: lidarr:nightly
+    container_name: lidarr
     environment:
       - "PUID=${PUID}"
       - "PGID=${PGID}"
@@ -38,7 +38,7 @@ services:
       - "PGID=${PGID}"
       - "UMASK=${UMASK}"
       - "TZ=${TZ}"
-    image: hotio/sonarr
+    image: hotio/sonarr:nightly
     privileged: true
     ports:
       - "${SONARRPORT}:8989"
diff --git a/Template/test.json b/Template/test.json
index d924050..9aa41b8 100644
--- a/Template/test.json
+++ b/Template/test.json
@@ -270,7 +270,7 @@
 		},
     {
 			"categories": [
-				"Media Server",
+				"Media",
 				"Movie",
 				"TV",
 				"Music",