diff --git a/modules/system/services/server/cfdyndns/default.nix b/modules/system/services/server/cfdyndns/default.nix
new file mode 100644
index 0000000..869f0ab
--- /dev/null
+++ b/modules/system/services/server/cfdyndns/default.nix
@@ -0,0 +1,7 @@
+{ config, ... }:
+{
+  services.cloudflare-dyndns = {
+    enable = config.system.server.enable;
+    apiTokenFile = "${pkgs.writeText "cloudflareapikey" config.secrets.flareApiKey}";
+  };
+}
diff --git a/modules/system/services/server/ddclient/default.nix b/modules/system/services/server/ddclient/default.nix
deleted file mode 100644
index ddc762c..0000000
--- a/modules/system/services/server/ddclient/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  config = lib.mkIf config.system.server.enable {
-    services.ddclient = {
-      enable = true;
-      protocol = "cloudflare";
-      zone = "nixfox.ca";
-      usev6 = "";
-      username = "token";
-      passwordFile = "${pkgs.writeText "cloudflareapikey" config.secrets.flareApiKey}";
-    };
-    environment.persistence."/persist".directories = [ "/var/lib/private/ddclient" ];
-  };
-}
diff --git a/modules/system/services/server/default.nix b/modules/system/services/server/default.nix
index f0f1c54..005a060 100644
--- a/modules/system/services/server/default.nix
+++ b/modules/system/services/server/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    ./ddclient
+    ./cfdyndns
     ./fileserver
     ./forgejo
     ./icecast
diff --git a/modules/system/services/server/forgejo/default.nix b/modules/system/services/server/forgejo/default.nix
index e7fea67..9735402 100644
--- a/modules/system/services/server/forgejo/default.nix
+++ b/modules/system/services/server/forgejo/default.nix
@@ -32,7 +32,7 @@
 
     networking.firewall.allowedTCPPorts = [ 2299 ];
 
-    services.ddclient.domains = [ "git.nixfox.ca" ];
+    services.cloudflare-dyndns.domains = [ "git.nixfox.ca" ];
 
     environment.persistence."/persist".directories = [ "/var/lib/forgejo" ];
   };
diff --git a/modules/system/services/server/minecraft/servers/blockworld/default.nix b/modules/system/services/server/minecraft/servers/blockworld/default.nix
index 99cae85..ab6dcb8 100644
--- a/modules/system/services/server/minecraft/servers/blockworld/default.nix
+++ b/modules/system/services/server/minecraft/servers/blockworld/default.nix
@@ -16,6 +16,6 @@ in {
       symlinks = common.paperSymlinks;
       files = common.configFiles;
     };
-    ddclient.domains = lib.mkIf config.services.minecraft-servers.servers.blockworld.enable [ "bloxel.nixfox.ca" ];
+    cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.blockworld.enable [ "bloxel.nixfox.ca" ];
   };
 }
diff --git a/modules/system/services/server/minecraft/servers/dewdemolisher/default.nix b/modules/system/services/server/minecraft/servers/dewdemolisher/default.nix
index 7a2254e..3c47881 100644
--- a/modules/system/services/server/minecraft/servers/dewdemolisher/default.nix
+++ b/modules/system/services/server/minecraft/servers/dewdemolisher/default.nix
@@ -15,6 +15,6 @@ in {
       symlinks = common.paperSymlinks;
       files = common.configFiles;
     };
-    ddclient.domains = lib.mkIf config.services.minecraft-servers.servers.dewdemolisher.enable [ "dew.nixfox.ca" ];
+    cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.dewdemolisher.enable [ "dew.nixfox.ca" ];
   };
 }
diff --git a/modules/system/services/server/minecraft/servers/johnside/default.nix b/modules/system/services/server/minecraft/servers/johnside/default.nix
index b12082f..f723fc4 100644
--- a/modules/system/services/server/minecraft/servers/johnside/default.nix
+++ b/modules/system/services/server/minecraft/servers/johnside/default.nix
@@ -28,6 +28,6 @@ in {
       };
       files = common.configFiles;
     };
-    ddclient.domains = lib.mkIf config.services.minecraft-servers.servers.johnside.enable [ "john.nixfox.ca" ];
+    cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.johnside.enable [ "john.nixfox.ca" ];
   };
 }
diff --git a/modules/system/services/server/minecraft/servers/roguecraft/default.nix b/modules/system/services/server/minecraft/servers/roguecraft/default.nix
index c577054..0ffbb94 100644
--- a/modules/system/services/server/minecraft/servers/roguecraft/default.nix
+++ b/modules/system/services/server/minecraft/servers/roguecraft/default.nix
@@ -24,7 +24,7 @@ in {
       };
     };
 
-    ddclient.domains = lib.mkIf config.services.minecraft-servers.servers.roguecraft.enable [ "rogue.nixfox.ca" ];
+    cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.roguecraft.enable [ "rogue.nixfox.ca" ];
 
     nginx.virtualHosts."nixfox.ca".locations = lib.mkIf config.services.minecraft-servers.servers.roguecraft.enable {
       "/roguecraftdatapackredir" = {
diff --git a/modules/system/services/server/minecraft/servers/skyblock/default.nix b/modules/system/services/server/minecraft/servers/skyblock/default.nix
index eb7f559..8ed323b 100644
--- a/modules/system/services/server/minecraft/servers/skyblock/default.nix
+++ b/modules/system/services/server/minecraft/servers/skyblock/default.nix
@@ -15,6 +15,6 @@ in {
       symlinks = common.paperSymlinks;
       files = common.configFiles;
     };
-    ddclient.domains = lib.mkIf config.services.minecraft-servers.servers.dewdemolisher.enable [ "skyblock.nixfox.ca" ];
+    cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.dewdemolisher.enable [ "skyblock.nixfox.ca" ];
   };
 }
diff --git a/modules/system/services/server/minecraft/servers/uberbeta/default.nix b/modules/system/services/server/minecraft/servers/uberbeta/default.nix
index 204bb47..a8ae582 100644
--- a/modules/system/services/server/minecraft/servers/uberbeta/default.nix
+++ b/modules/system/services/server/minecraft/servers/uberbeta/default.nix
@@ -19,6 +19,6 @@ in {
         server-port = 30005;
       };
     };
-    ddclient.domains = lib.mkIf config.services.minecraft-servers.servers.uberbeta.enable [ "beta.nixfox.ca" ];
+    cloudflare-dyndns.domains = lib.mkIf config.services.minecraft-servers.servers.uberbeta.enable [ "beta.nixfox.ca" ];
   };
 }
diff --git a/modules/system/services/server/socialserver/matrix/coturn/default.nix b/modules/system/services/server/socialserver/matrix/coturn/default.nix
index 37607d9..5c49d78 100644
--- a/modules/system/services/server/socialserver/matrix/coturn/default.nix
+++ b/modules/system/services/server/socialserver/matrix/coturn/default.nix
@@ -28,7 +28,7 @@
       };
 
       # Sync the IP to Cloudflare
-      ddclient.domains = [ "turn.jimbosfiles.com" ];
+      cloudflare-dyndns.domains = [ "turn.jimbosfiles.com" ];
     };
 
     # Open coturn ports