diff --git a/public/data/pages.json b/public/data/pages.json
index 57aff98..32e48a2 100644
--- a/public/data/pages.json
+++ b/public/data/pages.json
@@ -8,7 +8,7 @@
       "warn": "Note: Registration requires approval",
       "type": "docker",
       "docker_container_name": "nextcloud",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "Kavita",
@@ -18,17 +18,7 @@
       "warn": "Registration via Admin invite",
       "type": "docker",
       "docker_container_name": "kavita",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Komga",
-      "icon": "/icons/komga-logo.png",
-      "href": "https://komga.neshweb.net",
-      "desc": "Self-hosted Comic Library",
-      "warn": "Note: Registration only via Admin",
-      "type": "docker",
-      "docker_container_name": "komga",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "Calibre Web",
@@ -36,8 +26,9 @@
       "href": "https://calibre.neshweb.net/",
       "desc": "Self-hosted Ebook Library Service",
       "warn": "Note: Registration only via Admin",
-      "type": "app",
-      "location": "brr7-4800u"
+      "type": "docker",
+      "docker_container_name": "calibre-web",
+      "location": "tower-0"
     },
     {
       "name": "PeerTube",
@@ -47,7 +38,7 @@
       "warn": "Note: Registration only via Admin",
       "type": "docker",
       "docker_container_name": "peertube",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "Mastodon",
@@ -57,7 +48,7 @@
       "warn": "Note: Registration requires approval",
       "type": "docker",
       "docker_container_name": "mastodon-web",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
 
     {
@@ -68,7 +59,7 @@
       "warn": "Note: Invite only",
       "type": "docker",
       "docker_container_name": "vaultwarden",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "File Browser",
@@ -77,7 +68,7 @@
       "warn": "Note: Registration only via Admin",
       "type": "docker",
       "docker_container_name": "filebrowser",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "Jellyfin",
@@ -87,7 +78,7 @@
       "warn": "Note: Registration only via Admin",
       "type": "docker",
       "docker_container_name": "jellyfin",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "Navidrome",
@@ -97,7 +88,7 @@
       "warn": "Note: Registration only via Admin",
       "type": "docker",
       "docker_container_name": "navidrome",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "Picard",
@@ -106,7 +97,7 @@
       "warn": "Note: Access only via Admin",
       "type": "docker",
       "docker_container_name": "picard",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "Gitlab",
@@ -116,7 +107,7 @@
       "warn": "Note: Registration only via Admin",
       "type": "docker",
       "docker_container_name": "gitlab",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "Portainer",
@@ -126,7 +117,7 @@
       "warn": "Note: Admin Only",
       "type": "docker",
       "docker_container_name": "portainer",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
       "name": "Nginx Proxy Manager",
@@ -136,26 +127,16 @@
       "warn": "Note: Admin Only",
       "type": "docker",
       "docker_container_name": "nginx-prox",
-      "location": "brr7-4800u"
+      "location": "tower-0"
     },
     {
-      "name": "Grafana",
-      "icon": "/icons/grafana-logo.svg",
-      "href": "https://monitoring.neshweb.net/",
-      "desc": "Server Monitoring Utility",
+      "name": "Proxmox",
+      "icon": "/icons/proxmox-logo.png",
+      "href": "https://proxmox.neshweb.net/",
+      "desc": "Hypervisor Webinterface",
       "warn": "Note: Admin Only",
-      "type": "docker",
-      "docker_container_name": "grafana",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Matomo",
-      "href": "https://tracking.neshweb.net/",
-      "desc": "Traffic Tracking Utility",
-      "warn": "Note: Admin Only",
-      "type": "docker",
-      "docker_container_name": "matomo-web",
-      "location": "brr7-4800u"
+      "type": "app",
+      "location": ""
     }
   ],
   "games": {
diff --git a/public/pages.json b/public/pages.json
deleted file mode 100644
index f7378c9..0000000
--- a/public/pages.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-  "services": [
-    {
-      "name": "Nextcloud",
-      "icon": "/icons/nextcloud-logo.svg",
-      "href": "https://nextcloud.neshweb.net/",
-      "desc": "Self-hosted Cloud Storage Service",
-      "warn": "Note: Registration requires approval",
-      "type": "docker",
-      "docker_container_name": "nextcloud",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Komga",
-      "icon": "/icons/komga-logo.png",
-      "href": "https://komga.neshweb.net/",
-      "desc": "Self-hosted Comic Library",
-      "warn": "Note: Registration only via Admin",
-      "type": "docker",
-      "docker_container_name": "komga",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Calibre Web",
-      "icon": "/icons/calibre-logo.ico",
-      "href": "https://calibre.neshweb.net/",
-      "desc": "Self-hosted Ebook Library Service",
-      "warn": "Note: Registration only via Admin",
-      "type": "app",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "PeerTube",
-      "icon": "/icons/peertube-logo.svg",
-      "href": "https://tube.neshweb.net/",
-      "desc": "Self-hosted PeerTube Instance",
-      "warn": "Note: Registration only via Admin",
-      "type": "docker",
-      "docker_container_name": "peertube",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Mastodon",
-      "icon": "/icons/mastodon-logo.svg",
-      "href": "https://mastodon.neshweb.net/",
-      "desc": "Self-hosted Mastodon Instance",
-      "warn": "Note: Registration requires approval",
-      "type": "docker",
-      "docker_container_name": "mastodon-web",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "File Browser",
-      "href": "https://files.neshweb.net/",
-      "desc": "Server File Browser",
-      "warn": "Note: Registration only via Admin",
-      "type": "docker",
-      "docker_container_name": "filebrowser",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Jellyfin",
-      "icon": "/icons/jellyfin-logo.svg",
-      "href": "https://jellyfin.neshweb.net/",
-      "desc": "Open-Source, Self-Hosted Media Platform",
-      "warn": "Note: Registration only via Admin",
-      "type": "docker",
-      "docker_container_name": "jellyfin",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Navidrome",
-      "icon": "/icons/navidrome-logo.png",
-      "href": "https://navidrome.neshweb.net/",
-      "desc": "Open-Source, Self-Hosted Music Streaming Platform",
-      "warn": "Note: Registration only via Admin",
-      "type": "docker",
-      "docker_container_name": "navidrome",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Picard",
-      "href": "https://picard.neshweb.net/",
-      "desc": "MP3 Tagger",
-      "warn": "Note: Access only via Admin",
-      "type": "docker",
-      "docker_container_name": "picard",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Gitlab",
-      "icon": "/icons/gitlab-logo.svg",
-      "href": "https://gitlab.neshweb.net/",
-      "desc": "Self-hosted Git Service",
-      "warn": "Note: Registration only via Admin",
-      "type": "docker",
-      "docker_container_name": "gitlab",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Portainer",
-      "icon": "/icons/portainer-logo.png",
-      "href": "https://portainer.neshweb.net/",
-      "desc": "Docker Container Manager",
-      "warn": "Note: Admin Only",
-      "type": "docker",
-      "docker_container_name": "portainer",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Nginx Proxy Manager",
-      "icon": "/icons/npm-logo.png",
-      "href": "https://nginx.neshweb.net/",
-      "desc": "Web-based Nginx Proxy Manager",
-      "warn": "Note: Admin Only",
-      "type": "docker",
-      "docker_container_name": "nginx-prox",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Grafana",
-      "icon": "/icons/grafana-logo.svg",
-      "href": "https://monitoring.neshweb.net/",
-      "desc": "Server Monitoring Utility",
-      "warn": "Note: Admin Only",
-      "type": "docker",
-      "docker_container_name": "grafana",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Matomo",
-      "href": "https://tracking.neshweb.net/",
-      "desc": "Traffic Tracking Utility",
-      "warn": "Note: Admin Only",
-      "type": "docker",
-      "docker_container_name": "matomo-web",
-      "location": "brr7-4800u"
-    }
-  ],
-  "games": {
-    "minecraft": {
-      "name": "Minecraft",
-      "icon": "/icons/minecraft-logo.png",
-      "href": "https://minecraft.neshweb.net/",
-      "desc": "View all currently available Minecraft Servers and their mods"
-    },
-    "ready_or_not": {
-      "name": "Ready or Not",
-      "icon": "/icons/ron-logo.png",
-      "href": "https://readyornot.neshweb.net/",
-      "desc": "Collection of Floor Plans for the Game 'Ready or Not'"
-    },
-    "zomboid": {
-      "name": "Zomboid",
-      "icon": "/icons/zomboid-logo.png",
-      "ip": "91.13.248.30",
-      "status": "Online"
-    }
-  }
-}