diff --git a/.github/README.md b/.github/README.md
index 35d79ca..f269ced 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -109,8 +109,7 @@
   <details>
     <summary>Click here for a summary of my infrastructure</summary>
 
-<img width="3854" height="7060" alt="topology" src="https://github.com/user-attachments/assets/fc557fdb-b779-4530-ae19-93ff019a2b29" />
-
+<img width="4176" height="8367" alt="topology" src="https://github.com/user-attachments/assets/8b7f148d-8e49-4788-ba0f-4487482a483b" />
 
   ### Programs
 
diff --git a/SwarselSystems.org b/SwarselSystems.org
index 26fcf60..e76fb37 100644
--- a/SwarselSystems.org
+++ b/SwarselSystems.org
@@ -6207,7 +6207,7 @@ This machine mainly acts as my proxy server to stand before my local machines.
         };
         restic.targets = {
           SwarselMoonside = {
-            repository = config.repo.secrets.local.resticRepoState;
+            repository = config.repo.secrets.local.resticRepo;
             paths = [
               "/persist/opt/minecraft"
             ];
@@ -12727,11 +12727,7 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin
       sops.secrets.kavita-token = { inherit sopsFile; owner = serviceUser; };
 
       # networking.firewall.allowedTCPPorts = [ servicePort ];
-      topology.self.services.${serviceName} = {
-        name = "Kavita";
-        info = "https://${serviceDomain}";
-        icon = "${self}/files/topology-images/${serviceName}.png";
-      };
+      topology.self.services.${serviceName}.info = "https://${serviceDomain}";
 
       environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM {
         directories = [{ directory = "/var/lib/${serviceName}"; user = serviceUser; group = serviceGroup; }];
@@ -13148,11 +13144,7 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin
         mpv
       ];
 
-      topology.self.services.${serviceName} = {
-        name = lib.toUpper serviceName;
-        info = "http://localhost:${builtins.toString servicePort}";
-        icon = "${self}/files/topology-images/${serviceName}.png";
-      };
+      topology.self.services.${serviceName}.info = "http://localhost:${builtins.toString servicePort}";
 
       environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM {
         directories = [{ directory = "/var/lib/${serviceName}"; user = "mpd"; group = "mpd"; }];
@@ -13234,13 +13226,6 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin
     options.swarselmodules.server.${serviceName} = lib.mkEnableOption "enable ${serviceName} on server";
     config = lib.mkIf config.swarselmodules.server.${serviceName} {
 
-      topology.self.services = {
-        ${serviceName} = {
-          name = lib.swarselsystems.toCapitalized serviceName;
-          icon = "${self}/files/topology-images/${serviceName}.png";
-        };
-      };
-
       services = {
         ${serviceName} = {
           enable = true;
@@ -13388,19 +13373,13 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin
 
       # networking.firewall.allowedTCPPorts = [ servicePort federationPort ];
 
-      topology.self.services = {
-        ${serviceName} = {
-          name = lib.swarselsystems.toCapitalized serviceName;
-          info = "https://${serviceDomain}";
-          icon = "${self}/files/topology-images/${serviceName}.png";
-        };
-      } // (lib.listToAttrs (map
+      topology.self.services = lib.listToAttrs (map
         (service:
           lib.nameValuePair "mautrix-${service}" {
             name = "mautrix-${service}";
             icon = "${self}/files/topology-images/mautrix.png";
           })
-        [ "whatsapp" "signal" "telegram" ]));
+        [ "whatsapp" "signal" "telegram" ]);
 
       systemd = {
         timers."restart-bridges" = {
@@ -37573,8 +37552,7 @@ Here lies defined the readme for GitHub and Forgejo:
     <details>
       <summary>Click here for a summary of my infrastructure</summary>
 
-  <img width="3854" height="7060" alt="topology" src="https://github.com/user-attachments/assets/fc557fdb-b779-4530-ae19-93ff019a2b29" />
-
+  <img width="4176" height="8367" alt="topology" src="https://github.com/user-attachments/assets/8b7f148d-8e49-4788-ba0f-4487482a483b" />
 
     ### Programs
 
diff --git a/files/topology-images/ender3.png b/files/topology-images/ender3.png
index cff711a..16db113 100644
Binary files a/files/topology-images/ender3.png and b/files/topology-images/ender3.png differ
diff --git a/files/topology-images/ender3_.png b/files/topology-images/ender3_.png
deleted file mode 100644
index cff711a..0000000
Binary files a/files/topology-images/ender3_.png and /dev/null differ
diff --git a/files/topology/topology.png b/files/topology/topology.png
index d95587f..6960555 100644
Binary files a/files/topology/topology.png and b/files/topology/topology.png differ
diff --git a/files/topology/topology_small.png b/files/topology/topology_small.png
index e96fc81..d1663db 100644
Binary files a/files/topology/topology_small.png and b/files/topology/topology_small.png differ
diff --git a/hosts/nixos/aarch64-linux/moonside/default.nix b/hosts/nixos/aarch64-linux/moonside/default.nix
index 09d244b..2a7c61b 100644
--- a/hosts/nixos/aarch64-linux/moonside/default.nix
+++ b/hosts/nixos/aarch64-linux/moonside/default.nix
@@ -84,7 +84,7 @@ in
       };
       restic.targets = {
         SwarselMoonside = {
-          repository = config.repo.secrets.local.resticRepoState;
+          repository = config.repo.secrets.local.resticRepo;
           paths = [
             "/persist/opt/minecraft"
           ];
diff --git a/modules/nixos/server/kavita.nix b/modules/nixos/server/kavita.nix
index 2e59d4f..b058077 100644
--- a/modules/nixos/server/kavita.nix
+++ b/modules/nixos/server/kavita.nix
@@ -23,11 +23,7 @@ in
     sops.secrets.kavita-token = { inherit sopsFile; owner = serviceUser; };
 
     # networking.firewall.allowedTCPPorts = [ servicePort ];
-    topology.self.services.${serviceName} = {
-      name = "Kavita";
-      info = "https://${serviceDomain}";
-      icon = "${self}/files/topology-images/${serviceName}.png";
-    };
+    topology.self.services.${serviceName}.info = "https://${serviceDomain}";
 
     environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM {
       directories = [{ directory = "/var/lib/${serviceName}"; user = serviceUser; group = serviceGroup; }];
diff --git a/modules/nixos/server/matrix.nix b/modules/nixos/server/matrix.nix
index 9835376..908cd8e 100644
--- a/modules/nixos/server/matrix.nix
+++ b/modules/nixos/server/matrix.nix
@@ -63,19 +63,13 @@ in
 
     # networking.firewall.allowedTCPPorts = [ servicePort federationPort ];
 
-    topology.self.services = {
-      ${serviceName} = {
-        name = lib.swarselsystems.toCapitalized serviceName;
-        info = "https://${serviceDomain}";
-        icon = "${self}/files/topology-images/${serviceName}.png";
-      };
-    } // (lib.listToAttrs (map
+    topology.self.services = lib.listToAttrs (map
       (service:
         lib.nameValuePair "mautrix-${service}" {
           name = "mautrix-${service}";
           icon = "${self}/files/topology-images/mautrix.png";
         })
-      [ "whatsapp" "signal" "telegram" ]));
+      [ "whatsapp" "signal" "telegram" ]);
 
     systemd = {
       timers."restart-bridges" = {
diff --git a/modules/nixos/server/mpd.nix b/modules/nixos/server/mpd.nix
index 807135d..87f4a54 100644
--- a/modules/nixos/server/mpd.nix
+++ b/modules/nixos/server/mpd.nix
@@ -30,11 +30,7 @@ in
       mpv
     ];
 
-    topology.self.services.${serviceName} = {
-      name = lib.toUpper serviceName;
-      info = "http://localhost:${builtins.toString servicePort}";
-      icon = "${self}/files/topology-images/${serviceName}.png";
-    };
+    topology.self.services.${serviceName}.info = "http://localhost:${builtins.toString servicePort}";
 
     environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM {
       directories = [{ directory = "/var/lib/${serviceName}"; user = "mpd"; group = "mpd"; }];
diff --git a/modules/nixos/server/postgresql.nix b/modules/nixos/server/postgresql.nix
index 4cf3554..0a4f9f9 100644
--- a/modules/nixos/server/postgresql.nix
+++ b/modules/nixos/server/postgresql.nix
@@ -8,13 +8,6 @@ in
   options.swarselmodules.server.${serviceName} = lib.mkEnableOption "enable ${serviceName} on server";
   config = lib.mkIf config.swarselmodules.server.${serviceName} {
 
-    topology.self.services = {
-      ${serviceName} = {
-        name = lib.swarselsystems.toCapitalized serviceName;
-        icon = "${self}/files/topology-images/${serviceName}.png";
-      };
-    };
-
     services = {
       ${serviceName} = {
         enable = true;