diff --git a/flake.nix b/flake.nix
index ef14e02..5a16efb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,7 +58,6 @@
         ./modules/system/lact
         ./modules/system/retrodeck
         ./modules/system/steam
-        ./modules/system/syncthing
     ];
 
     serverSystemModules = [
@@ -88,6 +87,7 @@
           modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ displaySystemModules ++ gamingSystemModules ++ [
             ./hosts/${hostName}
             ./modules/system/jovian-${hostName}
+            ./modules/system/syncthing-${hostName}
             {
               home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
               ];
@@ -106,6 +106,7 @@
           modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ gamingSystemModules ++ [
             ./hosts/${hostName}
             ./modules/system/jovian-${hostName}
+            ./modules/system/syncthing-${hostName}
             {
               home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
               ];
@@ -124,6 +125,7 @@
           modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ gamingSystemModules ++ [
             ./hosts/${hostName}
             ./modules/system/jovian-${hostName}
+            ./modules/system/syncthing-${hostName}
             {
               home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
               ];
@@ -141,6 +143,7 @@
           specialArgs = {inherit user; inherit hostName; inherit system;};
           modules = externalSystemModules ++ baseSystemModules ++ serverSystemModules ++ [
             ./hosts/${hostName}
+            ./modules/system/syncthing-${hostName}
             {
               home-manager.users.${user}.imports = baseUserModules ++ serverUserModules ++ [
               ];
diff --git a/modules/system/syncthing-konsole/default.nix b/modules/system/syncthing-konsole/default.nix
new file mode 100644
index 0000000..209f4dc
--- /dev/null
+++ b/modules/system/syncthing-konsole/default.nix
@@ -0,0 +1,4 @@
+{ user, ... }:
+{
+
+}
diff --git a/modules/system/syncthing-server/default.nix b/modules/system/syncthing-server/default.nix
new file mode 100644
index 0000000..a059e7a
--- /dev/null
+++ b/modules/system/syncthing-server/default.nix
@@ -0,0 +1,3 @@
+{ user, ... }:
+{
+}
diff --git a/modules/system/syncthing/default.nix b/modules/system/syncthing-steamdeck/default.nix
similarity index 76%
rename from modules/system/syncthing/default.nix
rename to modules/system/syncthing-steamdeck/default.nix
index 35615ad..5671f28 100644
--- a/modules/system/syncthing/default.nix
+++ b/modules/system/syncthing-steamdeck/default.nix
@@ -1,5 +1,7 @@
 { user, ... }:
 {
+networking.firewall.allowedTCPPorts = [ 8384 22000 ];
+networking.firewall.allowedUDPPorts = [ 22000 21027 ];
 services = {
   syncthing = {
     enable = true;
@@ -11,12 +13,11 @@ services = {
     settings = {
       devices = {
         "workstation" = { id = "3TLJKSV-QURWERW-PZ7FUI4-LXL22PU-CFXXWRN-UBWTSPK-BJLHVWD-VMHEOQ2"; };
-        "steamdeck" = { id = "WOVNOIM-PCQX56E-WUWRCFO-7JFBAWF-QCE564I-4KXAHYW-ONZHHOT-DPHCEQ6"; };
       };
       folders = {
         "Decky-Loader" = {
           path = "/var/lib/decky-loader";
-          devices = [ "workstation" "steamdeck"];
+          devices = [ "workstation" ];
         };
       };
     };
diff --git a/modules/system/syncthing-workstation/default.nix b/modules/system/syncthing-workstation/default.nix
new file mode 100644
index 0000000..f2e5ecc
--- /dev/null
+++ b/modules/system/syncthing-workstation/default.nix
@@ -0,0 +1,26 @@
+{ user, ... }:
+{
+networking.firewall.allowedTCPPorts = [ 8384 22000 ];
+networking.firewall.allowedUDPPorts = [ 22000 21027 ];
+services = {
+  syncthing = {
+    enable = true;
+    user = "root";
+    dataDir = "/${user}/sync";
+    configDir = "/${user}/syncthing";
+    overrideDevices = true;
+    overrideFolders = true;
+    settings = {
+      devices = {
+        "steamdeck" = { id = "WOVNOIM-PCQX56E-WUWRCFO-7JFBAWF-QCE564I-4KXAHYW-ONZHHOT-DPHCEQ6"; };
+      };
+      folders = {
+        "Decky-Loader" = {
+          path = "/var/lib/decky-loader";
+          devices = [ "steamdeck"];
+        };
+      };
+    };
+  };
+};
+}