diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix
index 80e702b..68b4a52 100644
--- a/hosts/nixos/wallfacer/configuration.nix
+++ b/hosts/nixos/wallfacer/configuration.nix
@@ -9,7 +9,6 @@
     services = {
       nextcloud.enable = true;
       hydra.enable = true;
-      # caddy.enable = true;
       atticd.enable = true;
       cloudflared.enable = true;
     };
diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix
index c0be4eb..8ab1281 100644
--- a/modules/nixos/options.nix
+++ b/modules/nixos/options.nix
@@ -147,7 +147,6 @@
       nginx.enable = lib.mkEnableOption "nginx";
       ollama.enable = lib.mkEnableOption "ollama";
       forgejo.enable = lib.mkEnableOption "forgejo";
-      caddy.enable = lib.mkEnableOption "caddy";
       atticd.enable = lib.mkEnableOption "atticd";
       cloudflared.enable = lib.mkEnableOption "cloudflared";
       cloudflare-dyndns.enable = lib.mkEnableOption "cloudflare-dyndns";
diff --git a/modules/nixos/services/caddy.nix b/modules/nixos/services/caddy.nix
deleted file mode 100644
index c20c225..0000000
--- a/modules/nixos/services/caddy.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-{
-  config = lib.mkMerge [
-    (lib.mkIf config.osbmModules.services.caddy.enable {
-      services.caddy = {
-        enable = true;
-        # package = pkgs.caddy.withPlugins {
-        #   # update time to time
-        #   # last update: 2025-03-02
-        #   plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-        #   hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A=";
-        # };
-        # email = "osbm@osbm.dev";
-        # extraConfig = ''
-        #   (cloudflare) {
-        #     tls {
-        #       dns cloudflare {env.CF_API_TOKEN}
-        #     }
-        #   }
-        # '';
-        # globalConfig = ''
-        #   acme_dns cloudflare {env.CF_API_TOKEN}
-        # '';
-      };
-
-      networking.firewall.allowedTCPPorts = [
-        80
-        443
-        3000
-      ];
-
-      environment.systemPackages = with pkgs; [
-        nssTools
-      ];
-      age.secrets.cloudflare = {
-        file = ../../secrets/cloudflare.age;
-        path = "/etc/caddy/.env";
-        owner = "caddy";
-        mode = "0600";
-      };
-
-      systemd.services.caddy.serviceConfig = {
-        EnvironmentFile = "/etc/caddy/.env";
-      };
-
-      security.acme.acceptTerms = true;
-      security.acme.defaults = {
-        email = "osbm@osbm.dev";
-        acceptTerms = true;
-      };
-
-    })
-  ];
-}
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
index 4e5e78c..9be2666 100644
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./anubis.nix
     ./atticd.nix
-    ./caddy.nix
     ./cloudflare-dyndns.nix
     ./cloudflared.nix
     ./nextcloud.nix