diff --git a/tasks/general/acct_mgmt/users.yml b/tasks/general/acct_mgmt/users.yml
index 7952189..46b2a3c 100644
--- a/tasks/general/acct_mgmt/users.yml
+++ b/tasks/general/acct_mgmt/users.yml
@@ -780,9 +780,11 @@
     function_backup: |
       function backup {
         EXTRA="$1"
-        BACKUP_DIR="/tmp"
-        BACKUP_FILENAME="Backup-System-`now`.zip"
-        BACKUP="$BACKUP_DIR/$BACKUP_FILENAME"
+        TAG="System"
+        BASENAME="/tmp/Backup"
+        BACKUP="$BASENAME-`now`.$HOSTNAME.$TAG.zip"
+        echo "*** Removing Old Backups ***"
+        rm -fv "$BASENAME"*"$TAG"*
         echo "*** Creating backup at '$BACKUP' ***"
         sudo zip -rv "$BACKUP" \
           /etc /var/{log,mail,spool} /srv /boot \