diff --git a/modules/restic-server-client/default.nix b/modules/restic-server-client/default.nix
index cb64e29..0b26fef 100644
--- a/modules/restic-server-client/default.nix
+++ b/modules/restic-server-client/default.nix
@@ -20,10 +20,10 @@
     script = ''
       ${pkgs.restic}/bin/restic backup \
         --exclude-file=${inputs.self}/modules/restic/excludes.txt \
-        --tag home-dir-${config.networking.hostName} /home/${custom.username}
+        --tag home-dir /home/${custom.username}
 
       ${pkgs.restic}/bin/restic forget \
-        --tag home-dir-${config.networking.hostName} \
+        --tag home-dir \
         --host ${config.networking.hostName} \
         --keep-daily 7 \
         --keep-weekly 5 \
diff --git a/modules/restic-server-mysql-client/default.nix b/modules/restic-server-mysql-client/default.nix
index 7328d18..b77c4eb 100644
--- a/modules/restic-server-mysql-client/default.nix
+++ b/modules/restic-server-mysql-client/default.nix
@@ -20,16 +20,16 @@
     script = ''
       ${pkgs.restic}/bin/restic backup \
         --exclude-file=${inputs.self}/modules/restic/excludes.txt \
-        --tag home-dir-${config.networking.hostName} /home/${custom.username}
+        --tag home-dir /home/${custom.username}
 
       ${pkgs.mariadb}/bin/mysqldump --single-transaction --all-databases | \
       ${pkgs.restic}/bin/restic backup \
-        --tag mariadb-${config.networking.hostName} \
+        --tag mariadb \
         --stdin \
         --stdin-filename all_databases.sql
 
       ${pkgs.restic}/bin/restic forget \
-        --tag home-dir-${config.networking.hostName} \
+        --tag home-dir \
         --host ${config.networking.hostName} \
         --keep-daily 7 \
         --keep-weekly 5 \
@@ -37,7 +37,7 @@
         --keep-yearly 75
 
       ${pkgs.restic}/bin/restic forget \
-        --tag mariadb-${config.networking.hostName} \
+        --tag mariadb \
         --host ${config.networking.hostName} \
         --keep-daily 7 \
         --keep-weekly 5 \