diff --git a/modules/config/instances/config/roundcube.nix b/modules/config/instances/config/roundcube.nix
deleted file mode 100755
index 980d508..0000000
--- a/modules/config/instances/config/roundcube.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ moduleFunctions }:
-let
-  inherit (moduleFunctions.instancesFunctions)
-    domain0
-    servicePath
-    sslPath
-    sopsPath
-    ;
-
-  label = "Roundcube";
-  name = "roundcube";
-  subdomain = "mail";
-  domain = "${subdomain}.${domain0}";
-in
-{
-  label = label;
-  name = name;
-  short = "Round";
-  email = {
-    address0 = "noreply@${domain0}";
-  };
-  sops = {
-    path0 = "${sopsPath}/${name}";
-  };
-  domains = {
-    url0 = domain;
-  };
-  subdomain = subdomain;
-  tags = [
-    name
-    "email"
-  ];
-  paths = {
-    path0 = "${servicePath}/${label}";
-  };
-  ports = {
-    port0 = 9999;
-  };
-  ssl = {
-    cert = "${sslPath}/${domain}/fullchain.pem";
-    key = "${sslPath}/${domain}/key.pem";
-  };
-}
diff --git a/modules/nixos/services/acme/default.nix b/modules/nixos/services/acme/default.nix
index aba5cd1..2642d1b 100755
--- a/modules/nixos/services/acme/default.nix
+++ b/modules/nixos/services/acme/default.nix
@@ -36,19 +36,19 @@ in
           value = dnsConfig dns0Path dns0;
         })
         [
-          "audiobookshelf"
-          "glance"
-          "jellyfin"
-          "minecraft"
-          "nextcloud"
-          "ollama"
-          "searx"
-          "syncthing"
-          "vaultwarden"
-          "opencloud"
-          "prompter"
-          "comfyui"
-          "firefly-iii"
+          instances.audiobookshelf.name
+          instances.glance.name
+          instances.jellyfin.name
+          instances.minecraft.name
+          instances.nextcloud.name
+          instances.ollama.name
+          instances.searx.name
+          instances.syncthing.name
+          instances.vaultwarden.name
+          instances.opencloud.name
+          instances.prompter.name
+          instances.comfyui.name
+          instances.firefly-iii.name
         ]
       )
       ++ (map
@@ -57,9 +57,9 @@ in
           value = dnsConfig dns0Path dns0;
         })
         [
-          "forgejo"
-          "mastodon"
-          "peertube"
+          instances.forgejo.name
+          instances.mastodon.name
+          instances.peertube.name
         ]
       )
       ++ (map
diff --git a/modules/nixos/services/roundcube/default.nix b/modules/nixos/services/roundcube/default.nix
deleted file mode 100755
index 768f528..0000000
--- a/modules/nixos/services/roundcube/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  pkgs,
-  flake,
-  config,
-  ...
-}:
-let
-  inherit (flake.config.services.instances) roundcube web;
-
-  service = roundcube;
-  host = service.domains.address0;
-in
-{
-  services = {
-    roundcube = {
-      enable = true;
-      configureNginx = false;
-      dicts = builtins.attrValues {
-        inherit (pkgs.aspellDicts)
-          en
-          ;
-      };
-      plugins = [
-      ];
-      # hostName = host;
-      database = {
-        host = web.localhost.address1;
-        dbname = service.name;
-        username = "";
-        passwordFile = config.sops.secrets."${service.name}-pass".path;
-      };
-    };
-  };
-  sops =
-    let
-      sopsPath = secret: {
-        path = "${service.sops.path0}/${service.name}-${secret}";
-        owner = "root";
-        mode = "600";
-      };
-    in
-    {
-      secrets = builtins.listToAttrs (
-        map
-          (secret: {
-            name = "${service.name}-${secret}";
-            value = sopsPath secret;
-          })
-          [
-            "pass"
-          ]
-      );
-    };
-
-}