diff --git a/hosts/muffin/default.nix b/hosts/muffin/default.nix
index 43a333b..ed831d4 100644
--- a/hosts/muffin/default.nix
+++ b/hosts/muffin/default.nix
@@ -32,8 +32,7 @@
     ../../services/jellyfin
     ../../services/caddy
     ../../services/immich.nix
-    ../../services/gitea.nix
-    ../../services/gitea-actions-runner.nix
+    ../../services/gitea
     ../../services/minecraft.nix
 
     ../../services/wg.nix
diff --git a/services/gitea-actions-runner.nix b/services/gitea/actions-runner.nix
similarity index 100%
rename from services/gitea-actions-runner.nix
rename to services/gitea/actions-runner.nix
diff --git a/services/gitea/default.nix b/services/gitea/default.nix
new file mode 100644
index 0000000..4f23c0f
--- /dev/null
+++ b/services/gitea/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./gitea.nix
+    ./actions-runner.nix
+  ];
+}
diff --git a/services/gitea.nix b/services/gitea/gitea.nix
similarity index 100%
rename from services/gitea.nix
rename to services/gitea/gitea.nix
diff --git a/tests/fail2ban-gitea.nix b/tests/fail2ban-gitea.nix
index 65d6119..4b1a2a3 100644
--- a/tests/fail2ban-gitea.nix
+++ b/tests/fail2ban-gitea.nix
@@ -32,7 +32,7 @@ let
     { config, pkgs, ... }:
     {
       imports = [
-        (import ../services/gitea.nix {
+        (import ../services/gitea/gitea.nix {
           inherit config pkgs;
           lib = testLib;
           service_configs = testServiceConfigs;