diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix
index 53580ba..474733d 100644
--- a/modules/services/caddy.nix
+++ b/modules/services/caddy.nix
@@ -23,13 +23,13 @@
           hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc=";
         };
         email = "contact@osbm.dev";
-        extraConfig = ''
-          (cloudflare) {
-            tls {
-              dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-            }
-          }
-        '';
+        # extraConfig = ''
+        #   (cloudflare) {
+        #     tls {
+        #       dns cloudflare {env.CLOUDFLARE_API_TOKEN}
+        #     }
+        #   }
+        # '';
         virtualHosts = {
           "chat.osbm.dev" = {
             extraConfig = ''
@@ -39,7 +39,15 @@
           "aifred.osbm.dev" = {
             extraConfig = ''
               reverse_proxy localhost:8000
-              import cloudflare
+            '';
+          };
+          "git.osbm.dev" = {
+            serverAliases = [
+              "git.osbm.dev"
+              "www.git.osbm.dev"
+            ];
+            extraConfig = ''
+              reverse_proxy pochita.curl-boga.ts.net:${toString config.services.forgejo.settings.server.HTTP_PORT}
             '';
           };
         };
diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix
index be5e0ff..1b36d9e 100644
--- a/modules/services/forgejo.nix
+++ b/modules/services/forgejo.nix
@@ -26,14 +26,6 @@
         };
       };
     })
-    # if enableForgejo and enableCaddy are enabled, add forgejo to caddy
-    (lib.mkIf (config.myModules.enableForgejo && config.myModules.enableCaddy) {
-      services.caddy.virtualHosts."git.osbm.dev" = {
-        extraConfig = ''
-          reverse_proxy pochita.curl-boga.ts.net:${toString config.services.forgejo.settings.server.HTTP_PORT}
-          import cloudflare
-        '';
-      };
     })
   ];
 }