diff --git a/nix/hosts/nixedo/modules/acme.nix b/nix/hosts/nixedo/modules/acme.nix
index 352b753..c8b4a74 100644
--- a/nix/hosts/nixedo/modules/acme.nix
+++ b/nix/hosts/nixedo/modules/acme.nix
@@ -5,14 +5,14 @@
     acceptTerms = true;
 
     certs = {
-      "opdavies.uk" = {
-        domain = "opdavies.uk";
+      "oliverdavies.uk" = {
+        domain = "oliverdavies.uk";
         dnsProvider = "cloudflare";
         email = "oliver@oliverdavies.uk";
-        environmentFile = config.age.secrets.cloudflare-opdavies-uk.path;
+        environmentFile = config.age.secrets.cloudflare.path;
         webroot = null;
 
-        extraDomainNames = [ "*.opdavies.uk" ];
+        extraDomainNames = [ "*.oliverdavies.uk" ];
       };
     };
   };
diff --git a/nix/hosts/nixedo/secrets.nix b/nix/hosts/nixedo/secrets.nix
index b4448de..da8e7ae 100644
--- a/nix/hosts/nixedo/secrets.nix
+++ b/nix/hosts/nixedo/secrets.nix
@@ -1,6 +1,6 @@
 {
   age.secrets = {
-    cloudflare-opdavies-uk.file = ../../secrets/cloudflare-opdavies-uk.age;
+    cloudflare.file = ../../secrets/cloudflare.age;
     tubearchivist.file = ../../secrets/tubearchivist.age;
   };
 }
diff --git a/nix/modules/nixos/features/homelab/audiobookshelf.nix b/nix/modules/nixos/features/homelab/audiobookshelf.nix
index a0012a3..a357270 100644
--- a/nix/modules/nixos/features/homelab/audiobookshelf.nix
+++ b/nix/modules/nixos/features/homelab/audiobookshelf.nix
@@ -16,8 +16,8 @@ in
         port = 4001;
       };
 
-      caddy.virtualHosts."audiobookshelf.opdavies.uk" = {
-        useACMEHost = "opdavies.uk";
+      caddy.virtualHosts."audiobookshelf.oliverdavies.uk" = {
+        useACMEHost = "oliverdavies.uk";
 
         extraConfig = "reverse_proxy localhost:${toString config.services.audiobookshelf.port}";
       };
diff --git a/nix/modules/nixos/features/homelab/containers/beaverhabits.nix b/nix/modules/nixos/features/homelab/containers/beaverhabits.nix
index 98f362c..434f748 100644
--- a/nix/modules/nixos/features/homelab/containers/beaverhabits.nix
+++ b/nix/modules/nixos/features/homelab/containers/beaverhabits.nix
@@ -93,8 +93,8 @@ in
       };
     };
 
-    services.caddy.virtualHosts."beaverhabits.opdavies.uk" = {
-      useACMEHost = "opdavies.uk";
+    services.caddy.virtualHosts."beaverhabits.oliverdavies.uk" = {
+      useACMEHost = "oliverdavies.uk";
 
       extraConfig = "reverse_proxy localhost:${toString port}";
     };
diff --git a/nix/modules/nixos/features/homelab/containers/freshrss.nix b/nix/modules/nixos/features/homelab/containers/freshrss.nix
index 0dce90f..b383f71 100644
--- a/nix/modules/nixos/features/homelab/containers/freshrss.nix
+++ b/nix/modules/nixos/features/homelab/containers/freshrss.nix
@@ -100,8 +100,8 @@ in
       wantedBy = [ "multi-user.target" ];
     };
 
-    services.caddy.virtualHosts."freshrss.opdavies.uk" = {
-      useACMEHost = "opdavies.uk";
+    services.caddy.virtualHosts."freshrss.oliverdavies.uk" = {
+      useACMEHost = "oliverdavies.uk";
 
       extraConfig = "reverse_proxy localhost:${toString port}";
     };
diff --git a/nix/modules/nixos/features/homelab/containers/tubearchivist.nix b/nix/modules/nixos/features/homelab/containers/tubearchivist.nix
index d78afaf..ed10053 100644
--- a/nix/modules/nixos/features/homelab/containers/tubearchivist.nix
+++ b/nix/modules/nixos/features/homelab/containers/tubearchivist.nix
@@ -286,8 +286,8 @@ in
       wantedBy = [ "multi-user.target" ];
     };
 
-    services.caddy.virtualHosts."tubearchivist.opdavies.uk" = {
-      useACMEHost = "opdavies.uk";
+    services.caddy.virtualHosts."tubearchivist.oliverdavies.uk" = {
+      useACMEHost = "oliverdavies.uk";
 
       extraConfig = "reverse_proxy localhost:${toString port}";
     };
diff --git a/nix/modules/nixos/features/homelab/forgejo.nix b/nix/modules/nixos/features/homelab/forgejo.nix
index 509c34c..d23ba47 100644
--- a/nix/modules/nixos/features/homelab/forgejo.nix
+++ b/nix/modules/nixos/features/homelab/forgejo.nix
@@ -14,7 +14,7 @@ with lib;
 
         settings = {
           server = {
-            DOMAIN = "forgejo.opdavies.uk";
+            DOMAIN = "forgejo.oliverdavies.uk";
             HTTP_PORT = 2223;
           };
 
@@ -25,7 +25,7 @@ with lib;
       };
 
       caddy.virtualHosts."${config.services.forgejo.settings.server.DOMAIN}" = {
-        useACMEHost = "opdavies.uk";
+        useACMEHost = "oliverdavies.uk";
 
         extraConfig = "reverse_proxy localhost:${toString config.services.forgejo.settings.server.HTTP_PORT}";
       };
diff --git a/nix/modules/nixos/features/homelab/gitea.nix b/nix/modules/nixos/features/homelab/gitea.nix
index dadf227..d75221d 100644
--- a/nix/modules/nixos/features/homelab/gitea.nix
+++ b/nix/modules/nixos/features/homelab/gitea.nix
@@ -26,8 +26,8 @@ in
         };
       };
 
-      caddy.virtualHosts."gitea.opdavies.uk" = {
-        useACMEHost = "opdavies.uk";
+      caddy.virtualHosts."gitea.oliverdavies.uk" = {
+        useACMEHost = "oliverdavies.uk";
 
         extraConfig = "reverse_proxy localhost:${toString port}";
       };
diff --git a/nix/modules/nixos/features/homelab/immich.nix b/nix/modules/nixos/features/homelab/immich.nix
index 82b89dd..627a858 100644
--- a/nix/modules/nixos/features/homelab/immich.nix
+++ b/nix/modules/nixos/features/homelab/immich.nix
@@ -19,8 +19,8 @@ with lib;
 
     environment.systemPackages = [ pkgs.immich-cli ];
 
-    services.caddy.virtualHosts."immich.opdavies.uk" = {
-      useACMEHost = "opdavies.uk";
+    services.caddy.virtualHosts."immich.oliverdavies.uk" = {
+      useACMEHost = "oliverdavies.uk";
 
       extraConfig = "reverse_proxy localhost:${toString config.services.immich.port}";
     };
diff --git a/nix/modules/nixos/features/homelab/jellyfin.nix b/nix/modules/nixos/features/homelab/jellyfin.nix
index 4804a78..89bc38b 100644
--- a/nix/modules/nixos/features/homelab/jellyfin.nix
+++ b/nix/modules/nixos/features/homelab/jellyfin.nix
@@ -13,8 +13,8 @@ with lib;
       configDir = "/mnt/media/jellyfin";
     };
 
-    services.caddy.virtualHosts."jellyfin.opdavies.uk" = {
-      useACMEHost = "opdavies.uk";
+    services.caddy.virtualHosts."jellyfin.oliverdavies.uk" = {
+      useACMEHost = "oliverdavies.uk";
 
       extraConfig = "reverse_proxy localhost:8096";
     };
diff --git a/nix/modules/nixos/features/homelab/paperless.nix b/nix/modules/nixos/features/homelab/paperless.nix
index 38b1c37..4184ea9 100644
--- a/nix/modules/nixos/features/homelab/paperless.nix
+++ b/nix/modules/nixos/features/homelab/paperless.nix
@@ -2,6 +2,9 @@
 
 with lib;
 
+let
+  url = "paperless.oliverdavies.uk";
+in
 {
   options.features.homelab.paperless.enable = mkEnableOption "Enable paperless";
 
@@ -13,12 +16,12 @@ with lib;
         dataDir = "/mnt/media/paperless";
 
         settings = {
-          PAPERLESS_URL = "https://paperless.opdavies.uk";
+          PAPERLESS_URL = "https://${url}";
         };
       };
 
-      caddy.virtualHosts."paperless.opdavies.uk" = {
-        useACMEHost = "opdavies.uk";
+      caddy.virtualHosts."${url}" = {
+        useACMEHost = "oliverdavies.uk";
 
         extraConfig = "reverse_proxy localhost:28981";
       };
diff --git a/nix/modules/nixos/features/homelab/vaultwarden.nix b/nix/modules/nixos/features/homelab/vaultwarden.nix
index 25767b6..2871d47 100644
--- a/nix/modules/nixos/features/homelab/vaultwarden.nix
+++ b/nix/modules/nixos/features/homelab/vaultwarden.nix
@@ -11,7 +11,7 @@ with lib;
         enable = true;
 
         config = {
-          DOMAIN = "https://vaultwarden.opdavies.uk";
+          DOMAIN = "https://vaultwarden.oliverdavies.uk";
 
           # TODO: check registrations are disabled.
           SIGNUPS_ALLOWED = false;
@@ -21,8 +21,8 @@ with lib;
         };
       };
 
-      caddy.virtualHosts."vaultwarden.opdavies.uk" = {
-        useACMEHost = "opdavies.uk";
+      caddy.virtualHosts."vaultwarden.oliverdavies.uk" = {
+        useACMEHost = "oliverdavies.uk";
 
         extraConfig = "reverse_proxy localhost:${toString config.services.vaultwarden.config.ROCKET_PORT}";
       };
diff --git a/nix/secrets.nix b/nix/secrets.nix
index 800d970..c255374 100644
--- a/nix/secrets.nix
+++ b/nix/secrets.nix
@@ -13,14 +13,11 @@ in
 {
   "secrets/cloudflare.age".publicKeys = [
     hosts.hetznix
+    hosts.nixedo
     hosts.t490
     users.opdavies
   ] ++ users;
 
-  "secrets/cloudflare-opdavies-uk.age".publicKeys = [
-    hosts.nixedo
-  ] ++ users;
-
   "secrets/tubearchivist.age".publicKeys = [
     hosts.lemp11
     hosts.nixedo
diff --git a/nix/secrets/cloudflare-opdavies-uk.age b/nix/secrets/cloudflare-opdavies-uk.age
deleted file mode 100644
index ee5e9dc..0000000
Binary files a/nix/secrets/cloudflare-opdavies-uk.age and /dev/null differ