diff --git a/miyagi-backup.sh b/miyagi-backup.sh
index 5605578..dd0e64b 100644
--- a/miyagi-backup.sh
+++ b/miyagi-backup.sh
@@ -89,6 +89,14 @@ fi
 fi
 
 # Funktionen
+remote_ssh() {
+    ssh -p "$SSHPORT" "$@"
+}
+
+remote_scp() {
+    scp -P "$SSHPORT" "$@"
+}
+
 set_wol_g_enabled() {
     log "Pruefe, ob ethtool installiert ist..."
 
@@ -181,7 +189,7 @@ send_piggyback_data() {
     # Falls SOURCEHOSTNAME leer ist, ueber SSH vom Zielhost ermitteln
     if [[ -z "${SOURCEHOSTNAME:-}" ]]; then
         log "SOURCEHOSTNAME is empty retrieving via SSH from $SOURCEHOST..."
-        SOURCEHOSTNAME=$(ssh "$SOURCEHOST" hostname)
+        SOURCEHOSTNAME=$(ssh -p "$SSHPORT" "$SOURCEHOST" hostname)
         log "Detected SOURCEHOSTNAME: $SOURCEHOSTNAME"
     fi
 
@@ -197,7 +205,7 @@ send_piggyback_data() {
         echo "<<<<>>>>"
     } > "$filename"
 
-    if scp "$filename" "$SOURCEHOST:/var/lib/check_mk_agent/spool/"; then
+    if scp -P "$SSHPORT" "$filename" "$SOURCEHOST:/var/lib/check_mk_agent/spool/"; then
         log "Piggyback data successfully sent to $SOURCEHOST"
     else
         log "ERROR: Failed to send piggyback data to $SOURCEHOST"
@@ -280,7 +288,7 @@ run_maintenance() {
 }
 
 run_scrub_stop_src() {
-    ssh root@"$SOURCEHOST" 'for pool in $(zpool list -H -o name); do
+    ssh -p "$SSHPORT" root@"$SOURCEHOST" 'for pool in $(zpool list -H -o name); do
         echo "Stoppe Scrub auf Pool: $pool"
         if zpool status "$pool" | grep -q "scrub in progress"; then
             if zpool scrub -s "$pool"; then
@@ -331,12 +339,12 @@ main() {
     set_wol_g_enabled
     write_zsync_config
     run_zsync
-    run_maintenance
     run_scrub_stop_local
     run_scrub_stop_src
 
     if [[ "${BACKUPSERVER,,}" == "yes" ]]; then
         log "BACKUPSERVER ist aktiviert, führe Backup aus..."
+        run_maintenance
         run_pbs_backup
     else
         log "BACKUPSERVER ist nicht aktiviert (BACKUPSERVER=$BACKUPSERVER), überspringe Backup."