diff --git a/modules/server/containers/apps/homepage.nix b/modules/server/containers/apps/homepage.nix
index 70af553..eaa0458 100644
--- a/modules/server/containers/apps/homepage.nix
+++ b/modules/server/containers/apps/homepage.nix
@@ -120,11 +120,11 @@ let
                     };
                 };
             })
-            (lib.optionalAttrs (serverCfg.containers?servarr) (
+            (lib.optional (serverCfg.containers?servarr) (
             let 
                 modules = serverCfg.containers.servarr.extra.modules or ["prowlarr" "sonarr" "radarr" "flaresolverr" ];
             in
-            (lib.optionalAttrs (builtins.elem "sonarr" modules) {
+            (lib.optional (builtins.elem "sonarr" modules) {
                 Sonarr={
                     icon = "sonarr.png";
                     href = "https://${serverCfg.containers.servarr.subdomain}.${serverCfg.domain}/sonarr";
@@ -135,7 +135,7 @@ let
                          
                     };
                 };
-            }) // (lib.optionalAttrs (builtins.elem "radarr" modules) {
+            }) ++ (lib.optional (builtins.elem "radarr" modules) {
                 Radarr={
                     icon = "radarr.png";
                     href = "https://${serverCfg.containers.servarr.subdomain}.${serverCfg.domain}/radarr";
@@ -146,7 +146,7 @@ let
                          
                     };
                 };
-            }) // (lib.optionalAttrs (builtins.elem "lidarr" modules) {
+            }) ++ (lib.optional (builtins.elem "lidarr" modules) {
                 Lidarr={
                     icon = "lidarr.png";
                     href = "https://${serverCfg.containers.servarr.subdomain}.${serverCfg.domain}/lidarr";
@@ -157,7 +157,7 @@ let
                          
                     };
                 };
-            }) // (lib.optionalAttrs (builtins.elem "prowlarr" modules) {
+            }) ++ (lib.optional (builtins.elem "prowlarr" modules) {
                 Prowlarr={
                     icon = "prowlarr.png";
                     href = "https://${serverCfg.containers.servarr.subdomain}.${serverCfg.domain}/prowlarr";