diff --git a/modules/server/containers/apps/homepage.nix b/modules/server/containers/apps/homepage.nix
index c9f0af7..110cc54 100644
--- a/modules/server/containers/apps/homepage.nix
+++ b/modules/server/containers/apps/homepage.nix
@@ -109,10 +109,10 @@ let
           Calibre = {
             icon = "calibre.png";
             href = "https://${serverCfg.containers.calibre.subdomain}.${serverCfg.domain}";
-            siteMonitor = "http://calibre-server:8080";
+            siteMonitor = "http://calibre-server:8083";
             # widget = {
             #   type = "calibreweb";
-            #   url = "http://calibre-server:8080";
+            #   url = "http://calibre-server:8083";
             #   username = "?";
             #   password = "?";
             # };
@@ -122,10 +122,10 @@ let
           FreshRSS = {
             icon = "freshrss.png";
             href = "https://${serverCfg.containers.freshrss.subdomain}.${serverCfg.domain}";
-            siteMonitor = "http://freshrss-server:8080";
+            siteMonitor = "http://freshrss-server:80";
             # widget = {
             #   type = "freshrss";
-            #   url = "http://freshrss-server:8080";
+            #   url = "http://freshrss-server:80";
             #   username = "?";
             #   password = "?";
             # };
@@ -147,10 +147,10 @@ let
           Suwayomi = {
             icon = "suwayomi.png";
             href = "https://${serverCfg.containers.suwayomi.subdomain}.${serverCfg.domain}";
-            siteMonitor = "http://suwayomi-server:8080";
+            siteMonitor = "http://suwayomi-server:4567";
             widget = {
               type = "suwayomi";
-              url = "http://suwayomi-server:8080";
+              url = "http://suwayomi-server:4567";
             };
           };
         })
@@ -194,10 +194,10 @@ let
           Immich = {
             icon = "immich.png";
             href = "https://${serverCfg.containers.immich.subdomain}.${serverCfg.domain}";
-            siteMonitor = "http://immich-server:80";
+            siteMonitor = "http://immich-server:2283";
             widget = {
               type = "immich";
-              url = "http://immich-server:80";
+              url = "http://immich-server:2283";
               key = "{{HOMEPAGE_VAR_IMMICH_API}}";
               version = "2";
             };
@@ -234,10 +234,10 @@ let
           Gitea = {
             icon = "gitea.png";
             href = "https://${serverCfg.containers.gitea.subdomain}.${serverCfg.domain}";
-            siteMonitor = "http://gitea-server:3000";
+            siteMonitor = "http://gitea-server:8080";
             widget = {
               type = "gitea";
-              url = "http://gitea-server:3000";
+              url = "http://gitea-server:8080";
               key = "{{HOMEPAGE_VAR_GITEA_API}}";
             };
           };
@@ -312,8 +312,8 @@ let
         (lib.optional (serverCfg.containers ? selfmark) {
           Selfmark = {
             icon = "link.png";
-            href = "https://${serverCfg.containers.selfmark.subdomain}.${serverCfg.domain}";
-            siteMonitor = "http://selfmark-server:8080";
+            href = "https://${serverCfg.containers.selfmark.subdomain}.${serverCfg.domain}/selfmark";
+            siteMonitor = "http://selfmark-server:8080/selfmark";
           };
         })
         (lib.optional (serverCfg.containers ? servarr) (
@@ -324,10 +324,10 @@ let
               Sonarr = {
                 icon = "sonarr.png";
                 href = "https://${serverCfg.containers.servarr.subdomain}.${serverCfg.domain}/sonarr";
-                siteMonitor = "http://servarr-sonarr:8989";
+                siteMonitor = "http://servarr-sonarr:8989/sonarr";
                 widget = {
                   type = "sonarr";
-                  url = "http://servarr-sonarr:8989";
+                  url = "http://servarr-sonarr:8989/sonarr";
                   key = "{{HOMEPAGE_VAR_SONARR_API}}";
                 };
               };
@@ -336,10 +336,10 @@ let
               Radarr = {
                 icon = "radarr.png";
                 href = "https://${serverCfg.containers.servarr.subdomain}.${serverCfg.domain}/radarr";
-                siteMonitor = "http://servarr-radarr:8989";
+                siteMonitor = "http://servarr-radarr:8989/radarr";
                 widget = {
                   type = "radarr";
-                  url = "http://servarr-radarr:8989";
+                  url = "http://servarr-radarr:8989/radarr";
                   key = "{{HOMEPAGE_VAR_RADARR_API}}";
                 };
               };
@@ -348,10 +348,10 @@ let
               Lidarr = {
                 icon = "lidarr.png";
                 href = "https://${serverCfg.containers.servarr.subdomain}.${serverCfg.domain}/lidarr";
-                siteMonitor = "http://servarr-lidarr:8989";
+                siteMonitor = "http://servarr-lidarr:8989/lidarr";
                 widget = {
                   type = "lidarr";
-                  url = "http://servarr-lidarr:8989";
+                  url = "http://servarr-lidarr:8989/lidarr";
                   key = "{{HOMEPAGE_VAR_LIDARR_API}}";
                 };
               };
@@ -360,10 +360,10 @@ let
               Prowlarr = {
                 icon = "prowlarr.png";
                 href = "https://${serverCfg.containers.servarr.subdomain}.${serverCfg.domain}/prowlarr";
-                siteMonitor = "http://servarr-prowlarr:8989";
+                siteMonitor = "http://servarr-prowlarr:8989/prowlarr";
                 widget = {
                   type = "prowlarr";
-                  url = "http://servarr-prowlarr:8989";
+                  url = "http://servarr-prowlarr:8989/prowlarr";
                   key = "{{HOMEPAGE_VAR_PROWLARR_API}}";
                 };
               };