diff --git a/hosts/Infini-OPTIPLEX/vaultwarden.nix b/hosts/Infini-OPTIPLEX/vaultwarden.nix
index f975b48..fb0118c 100644
--- a/hosts/Infini-OPTIPLEX/vaultwarden.nix
+++ b/hosts/Infini-OPTIPLEX/vaultwarden.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  persist.directories = [ config.services.vaultwarden-test.dataDir ];
+  persist.directories = [ config.services.vaultwarden.dataDir ];
 
   services.nginx.virtualHosts."bitwarden.inx.moe" = config.common.nginx.ssl // {
     locations."/" = {
@@ -9,7 +9,7 @@
     };
   };
 
-  services.vaultwarden-test = {
+  services.vaultwarden = {
     enable = true;
     environmentFile = config.secrets."vaultwarden";
     dataDir = "/srv/vaultwarden";
diff --git a/modules/modules/services/vaultwarden-test.nix b/modules/modules/services/vaultwarden.nix
similarity index 97%
rename from modules/modules/services/vaultwarden-test.nix
rename to modules/modules/services/vaultwarden.nix
index 886b397..e39c86b 100644
--- a/modules/modules/services/vaultwarden-test.nix
+++ b/modules/modules/services/vaultwarden.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  cfg = config.services.vaultwarden-test;
+  cfg = config.services.vaultwarden;
   user = config.users.users.vaultwarden.name;
   group = config.users.groups.vaultwarden.name;
 
@@ -42,11 +42,13 @@ let
 
 in
 {
+  disabledModules = [ "services/security/vaultwarden/default.nix" ];
+
   imports = [
-    # (mkRenamedOptionModule [ "services" "bitwarden_rs" ] [ "services" "vaultwarden" ])
+    (mkRenamedOptionModule [ "services" "bitwarden_rs" ] [ "services" "vaultwarden" ])
   ];
 
-  options.services.vaultwarden-test = with types; {
+  options.services.vaultwarden = with types; {
     enable = mkEnableOption (lib.mdDoc "vaultwarden");
 
     dbBackend = mkOption {
diff --git a/secrets/default.nix b/secrets/default.nix
index 41385b9..968c11b 100644
--- a/secrets/default.nix
+++ b/secrets/default.nix
@@ -26,7 +26,7 @@ in
         "inx.moe.pem" = withOwner "nginx" secrets."inx.moe.pem";
         "inx.moe.key" = withOwner "nginx" secrets."inx.moe.key";
       })
-      (mkIf config.services.vaultwarden-test.enable {
+      (mkIf config.services.vaultwarden.enable {
         "vaultwarden" = withOwner "vaultwarden" secrets."vaultwarden";
       })
     ];