diff --git a/cosmicops/objects/host.py b/cosmicops/objects/host.py
index 1308b13..c171019 100644
--- a/cosmicops/objects/host.py
+++ b/cosmicops/objects/host.py
@@ -420,12 +420,12 @@ def wait_until_online(self):
             logging.info(f"Would wait for '{self['name']}' to come back online")
         else:
             logging.info(f"Waiting for '{self['name']}' to come back online", self.log_to_slack)
-            with click_spinner.spinner():
-                # adding retry tests, so we need to be able to connect to SSH three times in one minute
-                # before we consider the host up
-                tests = 1
+            # adding retry tests, so we need to be able to connect to SSH three times in one minute
+            # before we consider the host up
+            tests = 1
+            while tests <= 3:
                 logging.info(f"Waiting for SSH connection, attempt {tests} of 3", False)
-                while tests <= 3:
+                with click_spinner.spinner():
                     while True:
                         with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
                             s.settimeout(5)
@@ -434,7 +434,7 @@ def wait_until_online(self):
                         if result == 0:
                             break
                     time.sleep(20)
-                    tests += 1
+                tests += 1
 
         if self.dry_run:
             logging.info(f"Would wait for libvirt on '{self['name']}'")
diff --git a/rolling_reboot.py b/rolling_reboot.py
index 31b5d18..38ba83e 100755
--- a/rolling_reboot.py
+++ b/rolling_reboot.py
@@ -46,11 +46,11 @@
               help='Script to run on host after live migrations have completed')
 @click.option('--post-reboot-script', metavar='<script>', help='Script to run after host has rebooted')
 @click.option('--dry-run/--exec', is_flag=True, default=True, show_default=True, help='Enable/disable dry-run')
-@click.option('--target-host', help='Target hypervisor the migrate VMS to', required=False)
+@click.option('--proxy-host', help='Hypervisor the migrate VMS to, after which we migrate them back to origin', required=False)
 @click_log.simple_verbosity_option(logging.getLogger(), default="INFO", show_default=True)
 @click.argument('cluster')
 def main(profile, ignore_hosts, only_hosts, skip_os_version, reboot_action, pre_empty_script, post_empty_script,
-         post_reboot_script, dry_run, target_host, cluster):
+         post_reboot_script, dry_run, proxy_host, cluster):
     """Perform rolling reboot of hosts in CLUSTER"""
 
     click_log.basic_config()
@@ -75,6 +75,19 @@ def main(profile, ignore_hosts, only_hosts, skip_os_version, reboot_action, pre_
     hosts = cluster.get_all_hosts()
     logging.debug(f"Found hosts: {hosts}")
 
+    if proxy_host:
+        proxy_host = co.get_host(name=proxy_host)
+        if proxy_host is None:
+            logging.info(f"Cannot find proxy host {proxy_host} in Cosmic!")
+            sys.exit(1)
+
+        logging.info(f"Using proxy host: migrate ALL VMs to {proxy_host['name']}, then back to origin")
+        if not ignore_hosts:
+            logging.info(f"Adding proxy host {proxy_host['name']} to ignore list")
+            ignore_hosts = proxy_host['name']
+        else:
+            ignore_hosts += f",{proxy_host['name']}"
+
     if ignore_hosts:
         ignore_hosts = ignore_hosts.replace(' ', '').split(',')
         logging.info(f"Ignoring hosts: {str(ignore_hosts)}")
@@ -91,8 +104,8 @@ def main(profile, ignore_hosts, only_hosts, skip_os_version, reboot_action, pre_
 
     hosts.sort(key=itemgetter('name'))
 
-    if target_host:
-        target_host = co.get_host(name=target_host)
+    target_host = None
+
     for host in hosts:
         logging.slack_value = host['name']
         logging.zone_name = host['zonename']
@@ -119,6 +132,8 @@ def main(profile, ignore_hosts, only_hosts, skip_os_version, reboot_action, pre_
             log_to_slack)
 
         while True:
+            if proxy_host:
+                target_host = proxy_host
             (_, _, failed) = host.empty(target=target_host)
             if failed == 0:
                 break
@@ -155,6 +170,15 @@ def main(profile, ignore_hosts, only_hosts, skip_os_version, reboot_action, pre_
 
         host.restart_vms_with_shutdown_policy()
 
+        if proxy_host:
+            logging.info(f"Host '{host['name']}' is now empty (VMs are on proxy host {proxy_host['name']}). "
+                         f"Will now migrate VMs back to origin {host['name']}...", log_to_slack)
+            while True:
+                (_, _, failed) = proxy_host.empty(target=host)
+                if failed == 0:
+                    break
+            logging.info(f"Host '{host['name']}' is done. It should now have the same VMs as before", log_to_slack)
+
         target_host = host