diff --git a/machines/nunotaba/configuration.nix b/machines/nunotaba/configuration.nix
index ae78fab..c163949 100644
--- a/machines/nunotaba/configuration.nix
+++ b/machines/nunotaba/configuration.nix
@@ -12,7 +12,7 @@
     games.enable = true;
     gui.enable = true;
     media-proxy.enable = true;
-    restic.enable = true;
+    restic.system.enable = true;
     unfree.allowSoftware = true;
     wireguard.home.enable = true;
   };
diff --git a/machines/sayuri/configuration.nix b/machines/sayuri/configuration.nix
index 15b3246..b4785a5 100644
--- a/machines/sayuri/configuration.nix
+++ b/machines/sayuri/configuration.nix
@@ -11,7 +11,7 @@
     games.enable = true;
     gui.enable = true;
     media-proxy.enable = true;
-    restic = {
+    restic.system = {
       enable = true;
       extraPaths = [
         "/data"
diff --git a/machines/vueko/configuration.nix b/machines/vueko/configuration.nix
index 03cfacb..c927b08 100644
--- a/machines/vueko/configuration.nix
+++ b/machines/vueko/configuration.nix
@@ -16,7 +16,7 @@ in
   ];
 
   sbruder = {
-    restic.enable = true;
+    restic.system.enable = true;
     wireguard.home.enable = true;
     full = false;
 
diff --git a/modules/default.nix b/modules/default.nix
index de3dfec..25f7d95 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -51,7 +51,7 @@ in
     ./prometheus/node_exporter.nix
     ./pubkeys.nix
     ./pulseaudio.nix
-    ./restic.nix
+    ./restic
     ./secrets.nix
     ./ssh.nix
     ./tools.nix
diff --git a/modules/restic/default.nix b/modules/restic/default.nix
new file mode 100644
index 0000000..d8d9dc0
--- /dev/null
+++ b/modules/restic/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./system.nix
+  ];
+}
diff --git a/modules/restic.nix b/modules/restic/system.nix
similarity index 96%
rename from modules/restic.nix
rename to modules/restic/system.nix
index f6f2a16..d9684b8 100644
--- a/modules/restic.nix
+++ b/modules/restic/system.nix
@@ -1,6 +1,6 @@
 { pkgs, config, lib, ... }:
 let
-  cfg = config.sbruder.restic;
+  cfg = config.sbruder.restic.system;
 
   repository = "s3:https://s3.eu-central-1.wasabisys.com/sbruder-restic";
   excludes = [
@@ -39,7 +39,7 @@ let
   '';
 in
 {
-  options.sbruder.restic = {
+  options.sbruder.restic.system = {
     enable = lib.mkEnableOption "restic";
     timerConfig = lib.mkOption {
       type = with lib.types; attrsOf str;
@@ -79,6 +79,7 @@ in
       extraBackupArgs = [
         "--exclude-caches"
         "--exclude-file=${excludesFile}"
+        "--tag system"
         "--verbose"
       ];
     };