diff --git a/home/global/core/fastfetch/host/komodo.txt b/home/global/core/fastfetch/host/komo.txt
similarity index 100%
rename from home/global/core/fastfetch/host/komodo.txt
rename to home/global/core/fastfetch/host/komo.txt
diff --git a/hosts/nixos/komodo/config/authentik/compose.yaml b/hosts/nixos/komo/config/authentik/compose.yaml
similarity index 100%
rename from hosts/nixos/komodo/config/authentik/compose.yaml
rename to hosts/nixos/komo/config/authentik/compose.yaml
diff --git a/hosts/nixos/komodo/config/authentik/default.nix b/hosts/nixos/komo/config/authentik/default.nix
similarity index 97%
rename from hosts/nixos/komodo/config/authentik/default.nix
rename to hosts/nixos/komo/config/authentik/default.nix
index f01ebcb..ff2ccd3 100644
--- a/hosts/nixos/komodo/config/authentik/default.nix
+++ b/hosts/nixos/komo/config/authentik/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 let
-  # Only available in the Komodo LXC
+  # Only available in the Komo LXC
   DockerStorage = "/mnt/DockerStorage/komodo/stacks/authentik";
   env = config.secretsSpec.docker.authentik;
 in
@@ -94,7 +94,7 @@ in
     ];
   };
   virtualisation.oci-containers.containers."authentik-server" = {
-    image = "ghcr.io/goauthentik/server:2024.12.2";
+    image = "ghcr.io/goauthentik/server:2025.6.1";
     environment = env;
     volumes = [
       "${DockerStorage}/custom-templates:/templates:rw"
@@ -136,7 +136,7 @@ in
     ];
   };
   virtualisation.oci-containers.containers."authentik-worker" = {
-    image = "ghcr.io/goauthentik/server:2024.12.2";
+    image = "ghcr.io/goauthentik/server:2025.6.1";
     environment = env;
     volumes = [
       "${DockerStorage}/certs:/certs:rw"
diff --git a/hosts/nixos/komodo/config/caddy.nix b/hosts/nixos/komo/config/caddy.nix
similarity index 86%
rename from hosts/nixos/komodo/config/caddy.nix
rename to hosts/nixos/komo/config/caddy.nix
index 6e52cd5..66f1b73 100644
--- a/hosts/nixos/komodo/config/caddy.nix
+++ b/hosts/nixos/komo/config/caddy.nix
@@ -64,13 +64,6 @@
         '';
       };
 
-      "mail.ryot.foo" = {
-        useACMEHost = "ryot.foo";
-        extraConfig = ''
-          reverse_proxy localhost:9002
-        '';
-      };
-
       "map.ryot.foo" = {
         useACMEHost = "ryot.foo";
         extraConfig = ''
@@ -91,13 +84,6 @@
           reverse_proxy localhost:3000 
         '';
       };
-
-      "upsnap.ryot.foo" = {
-        useACMEHost = "ryot.foo";
-        extraConfig = ''
-          reverse_proxy localhost:8090
-        '';
-      };
     };
   };
 }
diff --git a/hosts/nixos/komodo/config/default.nix b/hosts/nixos/komo/config/default.nix
similarity index 100%
rename from hosts/nixos/komodo/config/default.nix
rename to hosts/nixos/komo/config/default.nix
diff --git a/hosts/nixos/komodo/config/komodo/compose.yaml b/hosts/nixos/komo/config/komodo/compose.yaml
similarity index 100%
rename from hosts/nixos/komodo/config/komodo/compose.yaml
rename to hosts/nixos/komo/config/komodo/compose.yaml
diff --git a/hosts/nixos/komodo/config/komodo/default.nix b/hosts/nixos/komo/config/komodo/default.nix
similarity index 100%
rename from hosts/nixos/komodo/config/komodo/default.nix
rename to hosts/nixos/komo/config/komodo/default.nix
diff --git a/hosts/nixos/komodo/default.nix b/hosts/nixos/komo/default.nix
similarity index 91%
rename from hosts/nixos/komodo/default.nix
rename to hosts/nixos/komo/default.nix
index 04a4340..55bb1e3 100644
--- a/hosts/nixos/komodo/default.nix
+++ b/hosts/nixos/komo/default.nix
@@ -1,6 +1,6 @@
 ###############################################################
 #
-#  Komodo - LXC Container
+#  Komo - LXC Container
 #  NixOS container, Ryzen 5 5600G (12 Cores), 30GB/2GB RAM/SWAP
 #
 #  Docker Environment, Managed by with Komodo
@@ -16,11 +16,11 @@
 let
   username = "toph";
   user = config.secretsSpec.users.${username};
-  firewall = config.secretsSpec.firewall.komodo;
+  firewall = config.secretsSpec.firewall.komo;
 in
 {
   imports = lib.flatten [
-    ## Komodo Only ##
+    ## Komo Only ##
     ./config
 
     ## Hardware ##
@@ -38,7 +38,7 @@ in
 
   ## Host Specifications ##
   hostSpec = {
-    hostName = "komodo";
+    hostName = "komo";
     username = username;
     hashedPassword = user.hashedPassword;
     email = user.email;
diff --git a/hosts/nixos/komodo/hardware.nix b/hosts/nixos/komo/hardware.nix
similarity index 100%
rename from hosts/nixos/komodo/hardware.nix
rename to hosts/nixos/komo/hardware.nix