diff --git a/gradle.properties b/gradle.properties
index faf99dac..3f810130 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,4 +16,4 @@
 
 group=com.nike
 artifactId=cerberus-lifecycle-cli
-version=1.7.0
+version=2.0.0
diff --git a/src/main/java/com/nike/cerberus/command/core/RollingRebootWithHealthCheckCommand.java b/src/main/java/com/nike/cerberus/command/core/RollingRebootWithHealthCheckCommand.java
index 1db261a4..a0b2bbab 100644
--- a/src/main/java/com/nike/cerberus/command/core/RollingRebootWithHealthCheckCommand.java
+++ b/src/main/java/com/nike/cerberus/command/core/RollingRebootWithHealthCheckCommand.java
@@ -19,7 +19,7 @@
 )
 public class RollingRebootWithHealthCheckCommand implements Command {
 
-    public static final String COMMAND_NAME = "rolling-reboot-with-health-check";
+    public static final String COMMAND_NAME = "rolling-reboot";
 
     @Parameter(names = {"--stack-name"}, required = true, description = "The stack name to reboot.")
     private StackName stackName = StackName.CMS;
diff --git a/src/main/java/com/nike/cerberus/operation/core/RollingRebootWithHealthCheckOperation.java b/src/main/java/com/nike/cerberus/operation/core/RollingRebootWithHealthCheckOperation.java
index c879aadd..94904631 100644
--- a/src/main/java/com/nike/cerberus/operation/core/RollingRebootWithHealthCheckOperation.java
+++ b/src/main/java/com/nike/cerberus/operation/core/RollingRebootWithHealthCheckOperation.java
@@ -41,10 +41,10 @@ public class RollingRebootWithHealthCheckOperation implements Operation<RollingR
 
     private final static ImmutableMap<String, String> HEALTH_CHECK_MAP = ImmutableMap.of(
             StackName.CMS.getName(),     "http://%s:8080/healthcheck",
-            StackName.GATEWAY.getName(), "https://%s:443/sys/health"
-            //  TODO: Test that command works with remaining stacks
-//            StackName.VAULT.getName(),   "https://%s:8200/v1/sys/health?standbyok",
-//            StackName.CONSUL.getName(),  "https://%s:8500/v1/sys/health"
+            StackName.GATEWAY.getName(), "https://%s:443/sys/health",
+            StackName.VAULT.getName(),   "https://%s:8200/v1/sys/health?standbyok"
+            // TODO: upgrade Consul and use new healthcheck
+//            StackName.CONSUL.getName(),  "http://%s:8580/v1/status/peers"
     );
 
     private final static int DEFAULT_HTTP_TIMEOUT = 15;
@@ -57,6 +57,8 @@ public class RollingRebootWithHealthCheckOperation implements Operation<RollingR
 
     private final static int EXPECTED_NUM_FAILURES_AFTER_REBOOT = 3;
 
+    private final static int EXPECTED_NUM_SUCCESSES_BEFORE_REBOOT = 1;
+
     private final static int HEALTH_CHECK_FAILED_CODE = -1;
 
     private final ConfigStore configStore;
@@ -118,6 +120,13 @@ public void run(final RollingRebootWithHealthCheckCommand command) {
      * Reboot an instance and make sure it comes back healthy
      */
     private void rebootInstance(StackName stackName, String autoScalingGroupId, Instance instance) {
+
+        final String healthCheckUrlTmpl = HEALTH_CHECK_MAP.get(stackName.getName());
+        final String healthCheckUrl = String.format(healthCheckUrlTmpl, instance.getPublicDnsName());
+
+        logger.info("Checking that instance health check is reachable...");
+        waitForHealthCheckStatusCode(healthCheckUrl, HttpStatus.OK, EXPECTED_NUM_SUCCESSES_BEFORE_REBOOT);
+
         final String instanceId = instance.getInstanceId();
         logger.info("Setting instance state to standby: {}", instanceId);
         autoScalingService.setInstanceStateToStandby(autoScalingGroupId, instanceId);
@@ -125,9 +134,6 @@ private void rebootInstance(StackName stackName, String autoScalingGroupId, Inst
         logger.info("Rebooting instance: {}", instanceId);
         ec2Service.rebootEc2Instance(instanceId);
 
-        final String healthCheckUrlTmpl = HEALTH_CHECK_MAP.get(stackName.getName());
-        final String healthCheckUrl = String.format(healthCheckUrlTmpl, instance.getPublicDnsName());
-
         // wait for health check fail to confirm box reboot
         logger.info("Waiting for health check failure to confirm reboot...");
         waitForHealthCheckStatusCode(healthCheckUrl, HEALTH_CHECK_FAILED_CODE, EXPECTED_NUM_FAILURES_AFTER_REBOOT);
@@ -201,7 +207,7 @@ private int executeHealthCheck(final String healthCheckUrl) {
             logger.debug("Health check returned status: {}, URL: {}", response.code(), healthCheckUrl);
             return response.code();
         } catch (IOException ioe) {
-            final String message = Chalk.on("Health check failed, Cause: {}, URL: {}").red().toString();
+            final String message = Chalk.on("Health check failed, Cause: \"{}\", URL: {}").red().toString();
             logger.debug(message, ioe.getMessage(), healthCheckUrl);
         }