diff --git a/homepage/.env b/homepage/.env
index 5fbabe0..89d8d9e 100755
--- a/homepage/.env
+++ b/homepage/.env
@@ -80,6 +80,12 @@ HOMEPAGE_VAR_MEMOS_URL=https://memos.akanealw.com
 # CHECKMK
 HOMEPAGE_VAR_CHECKMK_URL=https://checkmk.akanealw.com
 
+# CHECKMATE
+HOMEPAGE_VAR_CHECKMATE_URL=https://checkmate.akanealw.com
+
+# BESZEL
+HOMEPAGE_VAR_BESZEL_URL=https://beszel.akanealw.com
+
 # NZBDHYDRA
 HOMEPAGE_VAR_NZBHYDRA_URL=https://nzbhydra.akanealw.com
 
@@ -88,27 +94,21 @@ HOMEPAGE_VAR_JACKETT_URL=https://jackett.akanealw.com
 
 # PROWLARR
 HOMEPAGE_VAR_PROWLARR_URL=https://prowlarr.akanealw.com
-HOMEPAGE_VAR_PROWLARR_API_KEY=2f569338e49e4211be0457550eefabb2
 
 # JELLYSEER
 HOMEPAGE_VAR_JELLYSEERR_URL=https://jellyseerr.akanealw.com
-HOMEPAGE_VAR_JELLYSEERR_API_KEY=MTcwMDcwMjU2NjI1MTIwMTVjOWIwLTEwZDYtNDU5Yy1hNmRhLTQwNmRjOGIxY2E5OQ==
 
 # SONARR
 HOMEPAGE_VAR_SONARR_URL=https://sonarr.akanealw.com
-HOMEPAGE_VAR_SONARR_API_KEY=e4a9b4463bfc46b38fbe7420f54d3cd0
 
 # RADARR
 HOMEPAGE_VAR_RADARR_URL=https://radarr.akanealw.com
-HOMEPAGE_VAR_RADARR_API_KEY=5d459ee1602945bead1be6d93810bb8a
 
 # LIDARR
 HOMEPAGE_VAR_LIDARR_URL=https://lidarr.akanealw.com
-HOMEPAGE_VAR_LIDARR_API_KEY=7e2e2c76db3a40249bee49ee14d4a672
 
 # BAZARR
 HOMEPAGE_VAR_BAZARR_URL=https://bazarr.akanealw.com
-HOMEPAGE_VAR_BAZARR_API_KEY=52ffe0d71d284c95f426eaa4ac9bfa68
 
 # QBITTORRENT
 HOMEPAGE_VAR_QBITTORRENT_URL=https://qbittorrent.akanealw.com
@@ -124,9 +124,6 @@ HOMEPAGE_VAR_SPEEDTEST_URL=https://speedtest.akanealw.com
 
 # JDOWNLOADER
 HOMEPAGE_VAR_JDOWNLOADER_URL=https://jdownloader.akanealw.com
-HOMEPAGE_VAR_JDOWNLOADER_USERNAME=akanealw@gmail.com
-HOMEPAGE_VAR_JDOWNLOADER_PASSWORD=trUKY4X8wzGiCr75ZmC9
-HOMEPAGE_VAR_JDOWNLOADER_CLIENT_NAME=jdownloader@docker
 
 # METUBE
 HOMEPAGE_VAR_METUBE_URL=https://metube.akanealw.com
@@ -140,8 +137,6 @@ HOMEPAGE_VAR_MSTREAM_URL=https://mstream.akanealw.com
 
 # KAVITA
 HOMEPAGE_VAR_KAVITA_URL=https://kavita.akanealw.com
-HOMEPAGE_VAR_KAVITA_USERNAME=akanealw
-HOMEPAGE_VAR_KAVITA_PASSWORD=NneY3arvXx2FacypvEkU
 
 # FIREFOX_VPN
 HOMEPAGE_VAR_FIREFOX_VPN_URL=https://firefox.akanealw.com
@@ -149,9 +144,6 @@ HOMEPAGE_VAR_FIREFOX_VPN_URL=https://firefox.akanealw.com
 # WIKIDOCS
 HOMEPAGE_VAR_WIKIDOCS_URL=https://wiki.akanealw.com
 
-# MONITORR
-HOMEPAGE_VAR_MONITORR_URL=https://monitorr.akanealw.com
-
 # OLIVETIN
 HOMEPAGE_VAR_OLIVETIN_URL=https://olivetin.akanealw.com
 
@@ -210,11 +202,9 @@ HOMEPAGE_VAR_INVIDIOUS_URL=https://invidious.akanealw.com
 
 # NEXTCLOUD
 HOMEPAGE_VAR_NEXTCLOUD_URL=https://nextcloud.akanealw.com
-HOMEPAGE_VAR_NEXTCLOUD_USERNAME=akanealw
-HOMEPAGE_VAR_NEXTCLOUD_PASSWORD=sibs3-XjZMw-2ARBL-3iRjT-6xH2y
 
-# OPENWRT
-HOMEPAGE_VAR_OPENWRT_URL=https://router.akanealw.com
+# OPNSENSE
+HOMEPAGE_VAR_OPNSENSE_URL=https://router.akanealw.com
 
 # BALE ZFS SNAPSHOTS
 HOMEPAGE_VAR_BALE_URL=https://bale.akanealw.com
diff --git a/homepage/config/services.yaml b/homepage/config/services.yaml
index 868ba76..3b48820 100755
--- a/homepage/config/services.yaml
+++ b/homepage/config/services.yaml
@@ -206,10 +206,10 @@
         href: "{{HOMEPAGE_VAR_JACKETT_URL}}"
         siteMonitor: "{{HOMEPAGE_VAR_JACKETT_URL}}"
 
-    # - Firefox-VPN:
-    #     icon: "https://icons.akanealw.com/firefox.png"
-    #     href: "{{HOMEPAGE_VAR_FIREFOX_VPN_URL}}"
-    #     siteMonitor: "{{HOMEPAGE_VAR_FIREFOX_VPN_URL}}"
+    - Firefox-VPN:
+        icon: "https://icons.akanealw.com/firefox.png"
+        href: "{{HOMEPAGE_VAR_FIREFOX_VPN_URL}}"
+        siteMonitor: "{{HOMEPAGE_VAR_FIREFOX_VPN_URL}}"
 
     - ArchiveBox:
         icon: "https://icons.akanealw.com/archivebox.png"
@@ -316,15 +316,15 @@
         href: "{{HOMEPAGE_VAR_OLIVETIN_URL}}"
         siteMonitor: "{{HOMEPAGE_VAR_OLIVETIN_URL}}"
 
-    - OpenGist:
-        icon: "https://icons.akanealw.com/opengist.png"
-        href: "{{HOMEPAGE_VAR_OPEN_GIST_URL}}"
-        siteMonitor: "{{HOMEPAGE_VAR_OPEN_GIST_URL}}"
+    # - OpenGist:
+    #     icon: "https://icons.akanealw.com/opengist.png"
+    #     href: "{{HOMEPAGE_VAR_OPEN_GIST_URL}}"
+    #     siteMonitor: "{{HOMEPAGE_VAR_OPEN_GIST_URL}}"
 
-    - OpenWRT:
-        icon: "https://icons.akanealw.com/openwrt.png"
-        href: "{{HOMEPAGE_VAR_OPENWRT_URL}}"
-        siteMonitor: "{{HOMEPAGE_VAR_OPENWRT_URL}}"
+    - OPNsense:
+        icon: "https://icons.akanealw.com/opnsense.png"
+        href: "{{HOMEPAGE_VAR_OPNSENSE_URL}}"
+        siteMonitor: "{{HOMEPAGE_VAR_OPNSENSE_URL}}"
 
     - Paperless-ngx:
         icon: "https://icons.akanealw.com/paperless-ngx.png"
@@ -351,11 +351,6 @@
         href: "{{HOMEPAGE_VAR_RSS_BRIDGE_URL}}"
         siteMonitor: "{{HOMEPAGE_VAR_RSS_BRIDGE_URL}}"
 
-    # - Ryot:
-    #     icon: "https://icons.akanealw.com/ryot.png"
-    #     href: "{{HOMEPAGE_VAR_RYOT_URL}}"
-    #     siteMonitor: "{{HOMEPAGE_VAR_RYOT_URL}}"
-
     - Shlink:
         icon: "https://icons.akanealw.com/shlink.png"
         href: "{{HOMEPAGE_VAR_SHLINK_URL}}"
@@ -391,7 +386,7 @@
         href: "{{HOMEPAGE_VAR_WIREGUARD_UI_URL}}"
         siteMonitor: "{{HOMEPAGE_VAR_WIREGUARD_UI_URL}}"
 
-    - WikiDocs:
-        icon: "https://icons.akanealw.com/wazuh.png"
-        href: "{{HOMEPAGE_VAR_WIKIDOCS_URL}}"
-        siteMonitor: "{{HOMEPAGE_VAR_WIKIDOCS_URL}}"
+    # - WikiDocs:
+    #     icon: "https://icons.akanealw.com/wazuh.png"
+    #     href: "{{HOMEPAGE_VAR_WIKIDOCS_URL}}"
+    #     siteMonitor: "{{HOMEPAGE_VAR_WIKIDOCS_URL}}"