diff --git a/hosts/bolle/default.nix b/hosts/bolle/default.nix
index 63a6b22..4f7b4ce 100644
--- a/hosts/bolle/default.nix
+++ b/hosts/bolle/default.nix
@@ -9,6 +9,7 @@
     ./hardware-configuration.nix
     ../../hardware/opengl-intel.nix
     ../../profiles/auto-upgrade.nix
+    ../../profiles/sshd.nix
 
     ../../users # home-manager
     ../../users/pbsds
@@ -62,10 +63,6 @@
   # TODO: remove? Move?
   programs.dconf.enable = true;
 
-  # OpenSSH
-  services.openssh.enable = true;
-  services.openssh.settings.X11Forwarding = true;
-
   # System fonts
   # Nice to have when X-forwading on headless machines
   fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
diff --git a/hosts/nord/default.nix b/hosts/nord/default.nix
index c52c959..6c9b539 100644
--- a/hosts/nord/default.nix
+++ b/hosts/nord/default.nix
@@ -18,6 +18,7 @@
     ../../hardware/gpu/rocm.nix
     ../../hardware/gpu/intel.nix
     ../../profiles/auto-upgrade.nix
+    ../../profiles/sshd.nix
 
     ../../users # home-manager
     ../../users/pbsds
@@ -77,10 +78,6 @@
   # TODO: remove? Move?
   programs.dconf.enable = true;
 
-  # OpenSSH
-  services.openssh.enable = true;
-  services.openssh.settings.X11Forwarding = true;
-
   # System fonts
   fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
   fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji
diff --git a/hosts/noximilien/default.nix b/hosts/noximilien/default.nix
index 1dc8ff0..2ddf81b 100644
--- a/hosts/noximilien/default.nix
+++ b/hosts/noximilien/default.nix
@@ -8,6 +8,7 @@
     ./hardware-configuration.nix
     ../../hardware/gpu/intel.nix
     ../../profiles/auto-upgrade.nix
+    ../../profiles/sshd.nix
 
     ../../users # home-manager
     ../../users/pbsds
@@ -140,10 +141,6 @@
   #  enableSSHSupport = true;
   #};
 
-  # OpenSSH
-  services.openssh.enable = true;
-  services.openssh.settings.X11Forwarding = true;
-
   # System fonts
   # Nice to have when X-forwading on headless machines
   fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
diff --git a/hosts/sopp/default.nix b/hosts/sopp/default.nix
index 3c9c7fe..0fffb4d 100644
--- a/hosts/sopp/default.nix
+++ b/hosts/sopp/default.nix
@@ -24,6 +24,7 @@
     ../../hardware/gpu/intel.nix
     ../../hardware/printer/hp-laserjet-p1005.nix
     ../../profiles/auto-upgrade.nix
+    ../../profiles/sshd.nix
     ../../profiles/no-suspend.nix
 
     ../../users # home-manager
@@ -105,10 +106,6 @@
   # TODO: remove? Move?
   programs.dconf.enable = true;
 
-  # OpenSSH
-  services.openssh.enable = true;
-  services.openssh.settings.X11Forwarding = true;
-
   # System fonts
   fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
   fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji
diff --git a/profiles/sshd.nix b/profiles/sshd.nix
new file mode 100644
index 0000000..a43e6f9
--- /dev/null
+++ b/profiles/sshd.nix
@@ -0,0 +1,4 @@
+{
+  services.openssh.enable = true;
+  services.openssh.settings.X11Forwarding = true;
+}