diff --git a/CLAUDE.md b/CLAUDE.md
index c7ae0aa..8eb3a85 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -2,3 +2,4 @@
 
 - This is my nix configuration system. Whenever you need to introduce update to my config, remember to check the current config.
 - After you introduce updates, remember to reflect those updates in the readme, should they bring any changes.
+- Do not add the shebang when writing shell scripts
\ No newline at end of file
diff --git a/hosts/nixos/hs/system.nix b/hosts/nixos/hs/system.nix
index 644cbb1..9b29e92 100644
--- a/hosts/nixos/hs/system.nix
+++ b/hosts/nixos/hs/system.nix
@@ -275,6 +275,12 @@
     enableNotifications = true;
     gotifyUrl = "https://notify.yanlincs.com";
     gotifyToken = "Ac9qKFH5cA.7Yly";
+
+    # Integrity check configuration
+    enableIntegrityCheck = true;
+    integrityCheckFrequency = "Sun *-*-* 05:00:00";  # Weekly on Sunday at 5 AM (offset from VPS)
+    integrityCheckDepth = "archives";  # Check repository and archive metadata
+    integrityCheckLastArchives = 2;  # Check last 2 archives if using data verification (HS has larger data)
     
     preHook = ''
       echo "$(date): Starting Borg backup of ${config.networking.hostName}"
diff --git a/hosts/nixos/vps/system.nix b/hosts/nixos/vps/system.nix
index 324ec41..2214032 100644
--- a/hosts/nixos/vps/system.nix
+++ b/hosts/nixos/vps/system.nix
@@ -121,6 +121,12 @@
     gotifyUrl = "https://notify.yanlincs.com";
     gotifyToken = "AaiBamxPAhatNrO";
 
+    # Integrity check configuration
+    enableIntegrityCheck = true;
+    integrityCheckFrequency = "Sun *-*-* 04:00:00";  # Weekly on Sunday at 4 AM
+    integrityCheckDepth = "archives";  # Check repository and archive metadata
+    integrityCheckLastArchives = 3;  # Check last 3 archives if using data verification
+
     preHook = ''
       echo "$(date): Starting Borg backup of ${config.networking.hostName}"
     '';
diff --git a/modules/borg.nix b/modules/borg.nix
index f504b83..5d15b6f 100644
--- a/modules/borg.nix
+++ b/modules/borg.nix
@@ -159,6 +159,36 @@ in
       example = "Ac9qKFH5cA.7Yly";
       description = "Gotify API token for notifications";
     };
+
+    enableIntegrityCheck = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable regular integrity checks of the Borg repository";
+    };
+
+    integrityCheckFrequency = mkOption {
+      type = types.str;
+      default = "weekly";
+      example = "Sun *-*-* 04:00:00";
+      description = "Systemd timer frequency for integrity checks (OnCalendar format)";
+    };
+
+    integrityCheckDepth = mkOption {
+      type = types.enum [ "repository" "archives" "data" ];
+      default = "archives";
+      description = ''
+        Depth of integrity check:
+        - repository: Check repository consistency only (fastest)
+        - archives: Check repository and archive metadata (recommended)
+        - data: Full data verification including content (slowest)
+      '';
+    };
+
+    integrityCheckLastArchives = mkOption {
+      type = types.int;
+      default = 3;
+      description = "Number of most recent archives to check when using data verification";
+    };
   };
 
   config = mkIf cfg.enable {
@@ -385,14 +415,95 @@ in
       };
     };
 
-    # Enable and start the timer
-    systemd.targets.multi-user.wants = [ "borg-backup.timer" ];
+    # Enable and start the timers
+    systemd.targets.multi-user.wants = [ "borg-backup.timer" ] 
+      ++ (if cfg.enableIntegrityCheck then [ "borg-integrity-check.timer" ] else []);
+
+    # Systemd service for integrity checks
+    systemd.services.borg-integrity-check = mkIf cfg.enableIntegrityCheck {
+      description = "Borg Repository Integrity Check";
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+      
+      # Add borg and required tools to the service's PATH
+      path = [ pkgs.borgbackup pkgs.openssh pkgs.curl ];
+
+      serviceConfig = {
+        Type = "oneshot";
+        User = "root";
+        Group = "root";
+        
+        # Security settings
+        PrivateTmp = true;
+        ProtectSystem = "strict";
+        # Disable ProtectHome for SSH repositories to allow SSH key access
+        ProtectHome = mkIf (!(lib.hasPrefix "ssh://" cfg.repositoryUrl)) "read-only";
+        # Only add ReadWritePaths for local repositories
+        ReadWritePaths = mkIf (!(lib.hasPrefix "ssh://" cfg.repositoryUrl)) [ cfg.repositoryUrl ];
+        
+        # Environment
+        Environment = [
+          "BORG_REPO=${cfg.repositoryUrl}"
+          "BORG_RELOCATED_REPO_ACCESS_IS_OK=yes"
+          "BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK=no"
+        ];
+        EnvironmentFile = mkIf (cfg.passphraseFile != "") cfg.passphraseFile;
+      };
+
+      script = ''
+        # Set SSH command for remote repositories
+        export BORG_RSH="${cfg.sshCommand}"
+        
+        # Load passphrase from environment file
+        if [ -f "${cfg.passphraseFile}" ]; then
+          source "${cfg.passphraseFile}"
+        fi
+        
+        # Ensure root has access to SSH keys for remote repositories
+        if [[ "${cfg.repositoryUrl}" == ssh://* ]]; then
+          mkdir -p /root/.ssh
+          chmod 700 /root/.ssh
+          
+          # Copy SSH config if it exists
+          if [ -f /home/yanlin/.ssh/config ]; then
+            cp /home/yanlin/.ssh/config /root/.ssh/config
+            chmod 600 /root/.ssh/config
+          fi
+          
+          # Copy necessary SSH keys
+          if [ -d /home/yanlin/.ssh/keys ]; then
+            cp -r /home/yanlin/.ssh/keys /root/.ssh/
+            chmod -R 600 /root/.ssh/keys
+          fi
+        fi
+        
+        # Run the integrity check script
+        /home/yanlin/.config/nix/scripts/borg-integrity-check.sh \
+          "${cfg.repositoryUrl}" \
+          "${cfg.integrityCheckDepth}" \
+          "${toString cfg.integrityCheckLastArchives}" \
+          "${toString cfg.enableNotifications}" \
+          "${cfg.gotifyUrl}" \
+          "${cfg.gotifyToken}" \
+          "${config.networking.hostName}"
+      '';
+    };
+
+    # Systemd timer for scheduled integrity checks
+    systemd.timers.borg-integrity-check = mkIf cfg.enableIntegrityCheck {
+      description = "Borg Integrity Check Timer";
+      wantedBy = [ "timers.target" ];
+
+      timerConfig = {
+        OnCalendar = cfg.integrityCheckFrequency;
+        Persistent = true;
+        RandomizedDelaySec = "1h";  # Add randomization to avoid load spikes
+      };
+    };
 
     # Create a convenience script for manual backups
     environment.etc."borg-backup-manual" = {
       text = ''
-        #!/usr/bin/env bash
-        
         echo "Starting manual Borg backup..."
         systemctl start borg-backup.service
         
@@ -413,6 +524,10 @@ in
       borg-backup-now = "sudo systemctl start borg-backup.service";
       borg-list = "BORG_REPO='${cfg.repositoryUrl}' BORG_RSH='${cfg.sshCommand}' borg list";
       borg-info = "BORG_REPO='${cfg.repositoryUrl}' BORG_RSH='${cfg.sshCommand}' borg info";
-    };
+    } // (if cfg.enableIntegrityCheck then {
+      borg-check-now = "sudo systemctl start borg-integrity-check.service";
+      borg-check-status = "systemctl status borg-integrity-check.service borg-integrity-check.timer";
+      borg-check-logs = "journalctl -u borg-integrity-check.service -f";
+    } else {});
   };
 }
diff --git a/modules/rsync.nix b/modules/rsync.nix
index d142c43..b9d55e2 100644
--- a/modules/rsync.nix
+++ b/modules/rsync.nix
@@ -39,8 +39,6 @@
 
   # Create a convenient rsync wrapper script
   home.file.".local/bin/rsync-backup".text = ''
-    #!/bin/bash
-    # 
     # Convenient rsync backup wrapper
     # Usage: rsync-backup source/ destination/
     #
diff --git a/scripts/borg-integrity-check.sh b/scripts/borg-integrity-check.sh
new file mode 100755
index 0000000..62da0ff
--- /dev/null
+++ b/scripts/borg-integrity-check.sh
@@ -0,0 +1,201 @@
+# Borg backup integrity check script with notifications
+# Usage: borg-integrity-check.sh <repo_url> <check_depth> <last_archives> <enable_notifications> <gotify_url> <gotify_token> <hostname>
+
+set -euo pipefail
+
+# Validate arguments
+if [[ $# -ne 7 ]]; then
+    echo "Usage: $0 <repo_url> <check_depth> <last_archives> <enable_notifications> <gotify_url> <gotify_token> <hostname>"
+    exit 1
+fi
+
+# Get parameters
+REPO_URL="$1"
+CHECK_DEPTH="$2"
+LAST_ARCHIVES="$3"
+ENABLE_NOTIFICATIONS="$4"
+GOTIFY_URL="$5"
+GOTIFY_TOKEN="$6"
+HOSTNAME="$7"
+
+# Start time for tracking duration
+CHECK_START=$(date +%s)
+CHECK_DATE=$(date '+%Y-%m-%d %H:%M:%S')
+
+# Initialize result variables
+CHECK_RESULT="SUCCESS"
+CHECK_DETAILS=""
+ERRORS_FOUND=""
+
+# Function to send notifications
+send_notification() {
+    local priority="$1"
+    local title="$2"
+    local message="$3"
+    
+    if [ "$ENABLE_NOTIFICATIONS" = "1" ] && [ -n "$GOTIFY_URL" ] && [ -n "$GOTIFY_TOKEN" ]; then
+        /home/yanlin/.config/nix/scripts/gotify-notify.sh \
+            "$GOTIFY_URL" \
+            "$GOTIFY_TOKEN" \
+            "$priority" \
+            "$title" \
+            "$message" || echo "Failed to send notification (non-critical)" >&2
+    fi
+}
+
+# Function to run borg check with error handling
+run_borg_check() {
+    local check_args="$1"
+    local check_type="$2"
+    local output
+    local exit_code
+    
+    echo "Running $check_type check..."
+    
+    # Run the check and capture output
+    if output=$(borg check $check_args 2>&1); then
+        echo "$check_type check completed successfully"
+        CHECK_DETAILS="${CHECK_DETAILS}✓ $check_type check passed\n"
+        return 0
+    else
+        exit_code=$?
+        echo "ERROR: $check_type check failed with exit code $exit_code" >&2
+        echo "Output: $output" >&2
+        CHECK_RESULT="FAILED"
+        ERRORS_FOUND="${ERRORS_FOUND}✗ $check_type check failed (exit code: $exit_code)\n"
+        
+        # Extract specific error details if available
+        if echo "$output" | grep -q "corrupted"; then
+            ERRORS_FOUND="${ERRORS_FOUND}  - Corruption detected\n"
+        fi
+        if echo "$output" | grep -q "missing"; then
+            ERRORS_FOUND="${ERRORS_FOUND}  - Missing data detected\n"
+        fi
+        
+        return $exit_code
+    fi
+}
+
+# Main check logic
+echo "Starting Borg integrity check for $HOSTNAME at $CHECK_DATE"
+echo "Repository: $REPO_URL"
+echo "Check depth: $CHECK_DEPTH"
+
+# Repository consistency check (always performed)
+if ! run_borg_check "--repository-only" "Repository consistency"; then
+    # Repository check failure is critical - stop here
+    CHECK_END=$(date +%s)
+    CHECK_DURATION=$((CHECK_END - CHECK_START))
+    
+    send_notification "critical" \
+        "[$HOSTNAME] Borg Check Failed" \
+        "Repository consistency check failed!\n\nRepository: $REPO_URL\nDuration: ${CHECK_DURATION}s\n\nErrors:\n$ERRORS_FOUND\n\nImmediate attention required!"
+    
+    exit 1
+fi
+
+# Archive metadata check (if depth is archives or data)
+if [ "$CHECK_DEPTH" = "archives" ] || [ "$CHECK_DEPTH" = "data" ]; then
+    if ! run_borg_check "--archives-only" "Archive metadata"; then
+        # Archive check failure is serious but not necessarily critical
+        echo "WARNING: Archive metadata check failed, but repository is consistent"
+    fi
+fi
+
+# Full data verification (if depth is data)
+if [ "$CHECK_DEPTH" = "data" ]; then
+    echo "Performing full data verification on last $LAST_ARCHIVES archives..."
+    
+    # Get the list of archives and select the last N
+    if ARCHIVE_LIST=$(borg list --short 2>/dev/null | tail -n "$LAST_ARCHIVES"); then
+        if [ -n "$ARCHIVE_LIST" ]; then
+            # Build the check command with specific archives
+            ARCHIVE_ARGS=""
+            while IFS= read -r archive; do
+                ARCHIVE_ARGS="$ARCHIVE_ARGS --glob-archives '$archive'"
+            done <<< "$ARCHIVE_LIST"
+            
+            # Run data verification on selected archives
+            if ! run_borg_check "$ARCHIVE_ARGS" "Data verification ($LAST_ARCHIVES archives)"; then
+                echo "WARNING: Data verification failed for some archives"
+            fi
+        else
+            echo "No archives found for data verification"
+            CHECK_DETAILS="${CHECK_DETAILS}⚠ No archives available for data verification\n"
+        fi
+    else
+        echo "Failed to list archives for data verification"
+        CHECK_DETAILS="${CHECK_DETAILS}⚠ Could not list archives for data verification\n"
+    fi
+fi
+
+# Calculate total duration
+CHECK_END=$(date +%s)
+CHECK_DURATION=$((CHECK_END - CHECK_START))
+
+# Format duration for display
+if [ $CHECK_DURATION -ge 3600 ]; then
+    DURATION_STR="$(($CHECK_DURATION / 3600))h $(($CHECK_DURATION % 3600 / 60))m"
+elif [ $CHECK_DURATION -ge 60 ]; then
+    DURATION_STR="$(($CHECK_DURATION / 60))m $(($CHECK_DURATION % 60))s"
+else
+    DURATION_STR="${CHECK_DURATION}s"
+fi
+
+# Get repository statistics for the notification
+REPO_STATS=""
+if REPO_INFO=$(borg info --json 2>/dev/null); then
+    # Try to extract useful stats (this is a simplified version)
+    if command -v jq >/dev/null 2>&1; then
+        TOTAL_SIZE=$(echo "$REPO_INFO" | jq -r '.cache.stats.total_size // 0' 2>/dev/null || echo "0")
+        TOTAL_CHUNKS=$(echo "$REPO_INFO" | jq -r '.cache.stats.total_chunks // 0' 2>/dev/null || echo "0")
+        
+        if [ "$TOTAL_SIZE" != "0" ]; then
+            # Convert bytes to human-readable format
+            TOTAL_SIZE_MB=$((TOTAL_SIZE / 1024 / 1024))
+            if [ $TOTAL_SIZE_MB -ge 1024 ]; then
+                TOTAL_SIZE_GB=$((TOTAL_SIZE_MB / 1024))
+                REPO_STATS="\n\nRepository Stats:\n• Total size: ${TOTAL_SIZE_GB}GB\n• Total chunks: $TOTAL_CHUNKS"
+            else
+                REPO_STATS="\n\nRepository Stats:\n• Total size: ${TOTAL_SIZE_MB}MB\n• Total chunks: $TOTAL_CHUNKS"
+            fi
+        fi
+    fi
+fi
+
+# Prepare final message
+if [ "$CHECK_RESULT" = "SUCCESS" ]; then
+    SUCCESS_MSG="Integrity check completed successfully for $HOSTNAME\n\n"
+    SUCCESS_MSG="${SUCCESS_MSG}Repository: $REPO_URL\n"
+    SUCCESS_MSG="${SUCCESS_MSG}Check depth: $CHECK_DEPTH\n"
+    SUCCESS_MSG="${SUCCESS_MSG}Duration: $DURATION_STR\n\n"
+    SUCCESS_MSG="${SUCCESS_MSG}Results:\n$CHECK_DETAILS"
+    SUCCESS_MSG="${SUCCESS_MSG}$REPO_STATS"
+    
+    echo "Integrity check completed successfully"
+    echo -e "$SUCCESS_MSG"
+    
+    send_notification "normal" \
+        "[$HOSTNAME] Borg Check Passed" \
+        "$SUCCESS_MSG"
+else
+    FAILURE_MSG="Integrity check found issues for $HOSTNAME\n\n"
+    FAILURE_MSG="${FAILURE_MSG}Repository: $REPO_URL\n"
+    FAILURE_MSG="${FAILURE_MSG}Check depth: $CHECK_DEPTH\n"
+    FAILURE_MSG="${FAILURE_MSG}Duration: $DURATION_STR\n\n"
+    FAILURE_MSG="${FAILURE_MSG}Issues found:\n$ERRORS_FOUND\n"
+    FAILURE_MSG="${FAILURE_MSG}Successful checks:\n$CHECK_DETAILS"
+    FAILURE_MSG="${FAILURE_MSG}$REPO_STATS"
+    
+    echo "Integrity check completed with errors"
+    echo -e "$FAILURE_MSG"
+    
+    send_notification "high" \
+        "[$HOSTNAME] Borg Check Issues" \
+        "$FAILURE_MSG"
+    
+    # Exit with error code to indicate failure
+    exit 1
+fi
+
+echo "Integrity check process completed"