diff --git a/hosts/machine/mafuyu/configuration.nix b/hosts/machine/mafuyu/configuration.nix
index f48c276..bdb3218 100644
--- a/hosts/machine/mafuyu/configuration.nix
+++ b/hosts/machine/mafuyu/configuration.nix
@@ -4,7 +4,7 @@
     ./hardware-configuration.nix
 
     "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/nixos/features/boot.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
     "${inputs.self}/modules/nixos/features/fonts.nix"
     "${inputs.self}/modules/nixos/features/packages.nix"
     "${inputs.self}/modules/nixos/features/plasma.nix"
diff --git a/hosts/server/hikari/hako/configuration.nix b/hosts/server/hikari/hako/configuration.nix
index 32da0d9..8978761 100644
--- a/hosts/server/hikari/hako/configuration.nix
+++ b/hosts/server/hikari/hako/configuration.nix
@@ -3,8 +3,8 @@
   imports = [
     ./hardware-configuration.nix
     "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/nixos/features/boot.nix"
-    "${inputs.self}/modules/nixos/features/ssh.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
     "${inputs.self}/modules/nixos/features/management/docker.nix"
   ];
 
diff --git a/hosts/server/hikari/hako/services/forgejo.nix b/hosts/server/hikari/hako/services/forgejo.nix
index de4a561..bd43068 100644
--- a/hosts/server/hikari/hako/services/forgejo.nix
+++ b/hosts/server/hikari/hako/services/forgejo.nix
@@ -102,7 +102,7 @@
       };
 
       actions = {
-        ENABLED = true;
+        ENABLED = false;
       };
 
       ui = {
diff --git a/hosts/server/kazusa/configuration.nix b/hosts/server/kazusa/configuration.nix
index 7e2edba..a2d453b 100644
--- a/hosts/server/kazusa/configuration.nix
+++ b/hosts/server/kazusa/configuration.nix
@@ -7,8 +7,8 @@
 {
   imports = [
     "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/nixos/features/boot.nix"
-    "${inputs.self}/modules/nixos/features/ssh.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
     "${inputs.self}/modules/nixos/features/management/docker.nix"
     ./services/mailserver.nix
     ./services/caddy.nix
diff --git a/hosts/server/natsu/configuration.nix b/hosts/server/natsu/configuration.nix
index 3696dec..72e5a93 100644
--- a/hosts/server/natsu/configuration.nix
+++ b/hosts/server/natsu/configuration.nix
@@ -3,8 +3,8 @@
   imports = [
     ./hardware-configuration.nix
     "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/nixos/features/boot.nix"
-    "${inputs.self}/modules/nixos/features/ssh.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
     "${inputs.self}/modules/nixos/features/management/docker.nix"
   ];