diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix
index 37d3b3d..cc03e8f 100644
--- a/modules/nixos/services/forgejo.nix
+++ b/modules/nixos/services/forgejo.nix
@@ -33,6 +33,9 @@
           };
         };
       };
+    })
+
+    (lib.mkIf (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.forgejo.enable) {
       services.cloudflared.tunnels = {
         "eb9052aa-9867-482f-80e3-97a7d7e2ef04" = {
           default = "http_status:404";
diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix
index 1fcf4d2..f2d4209 100644
--- a/modules/nixos/services/glance.nix
+++ b/modules/nixos/services/glance.nix
@@ -163,6 +163,8 @@
         };
       };
       networking.firewall.allowedTCPPorts = [ config.services.glance.settings.server.port ];
+    })
+    (lib.mkIf (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.glance.enable) {
       services.cloudflared.tunnels = {
         "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = {
           default = "http_status:404";