diff --git a/infrastructure/docker/image/resources/file-functions.sh b/infrastructure/docker/image/resources/file-functions.sh
index 798147e..42c8421 100644
--- a/infrastructure/docker/image/resources/file-functions.sh
+++ b/infrastructure/docker/image/resources/file-functions.sh
@@ -17,11 +17,11 @@ function backup-directory() {
   then
     restic -v -r ${RESTIC_REPOSITORY}/files unlock --cleanup-cache
     cd ${directory} && restic -v -r ${RESTIC_REPOSITORY}/files backup .
-    restic -v -r ${RESTIC_REPOSITORY}/files forget --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune
+    restic -v -r ${RESTIC_REPOSITORY}/files forget --group-by '' --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune
   else
     restic -v -r ${RESTIC_REPOSITORY}/files unlock --cleanup-cache --cacert ${CERTIFICATE_FILE}
     cd ${directory} && restic -v -r ${RESTIC_REPOSITORY}/files backup . --cacert ${CERTIFICATE_FILE}
-    restic -v -r ${RESTIC_REPOSITORY}/files forget --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune --cacert ${CERTIFICATE_FILE}
+    restic -v -r ${RESTIC_REPOSITORY}/files forget --group-by '' --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune --cacert ${CERTIFICATE_FILE}
   fi
 }
 
@@ -33,11 +33,11 @@ function backup-fs-from-directory() {
   then
     restic -v -r ${RESTIC_REPOSITORY}/files unlock --cleanup-cache
     cd ${directory} && restic -v -r ${RESTIC_REPOSITORY}/files backup $@
-    restic -v -r ${RESTIC_REPOSITORY}/files forget --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune
+    restic -v -r ${RESTIC_REPOSITORY}/files forget --group-by '' --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune
   else
     restic -v -r ${RESTIC_REPOSITORY}/files unlock --cleanup-cache --cacert ${CERTIFICATE_FILE}
     cd ${directory} && restic -v -r ${RESTIC_REPOSITORY}/files backup $@ --cacert ${CERTIFICATE_FILE}
-    restic -v -r ${RESTIC_REPOSITORY}/files forget --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune --cacert ${CERTIFICATE_FILE}
+    restic -v -r ${RESTIC_REPOSITORY}/files forget --group-by '' --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune --cacert ${CERTIFICATE_FILE}
   fi
   
 }
diff --git a/infrastructure/docker/image/resources/pg-functions.sh b/infrastructure/docker/image/resources/pg-functions.sh
index 20827d3..5725052 100644
--- a/infrastructure/docker/image/resources/pg-functions.sh
+++ b/infrastructure/docker/image/resources/pg-functions.sh
@@ -47,7 +47,7 @@ function roles-unlock-command() {
 }
 
 function roles-forget-command() {
-  restic -v -r ${RESTIC_REPOSITORY}/pg-role forget --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune $@
+  restic -v -r ${RESTIC_REPOSITORY}/pg-role forget --group-by '' --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune $@
 }
 
 function backup-roles() {
@@ -72,7 +72,7 @@ function db-unlock-command() {
 }
 
 function db-forget-command() {
-  restic -v -r ${RESTIC_REPOSITORY}/pg-database forget --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune $@
+  restic -v -r ${RESTIC_REPOSITORY}/pg-database forget --group-by '' --keep-last 1 --keep-daily ${RESTIC_DAYS_TO_KEEP} --keep-monthly ${RESTIC_MONTHS_TO_KEEP} --prune $@
 }
 
 function backup-db-dump() {