diff --git a/compass/deployment/installers/pk_installers/chef_installer/chef_installer.py b/compass/deployment/installers/pk_installers/chef_installer/chef_installer.py
index 288d0849..2f798eb8 100644
--- a/compass/deployment/installers/pk_installers/chef_installer/chef_installer.py
+++ b/compass/deployment/installers/pk_installers/chef_installer/chef_installer.py
@@ -661,6 +661,7 @@ class ChefInstaller(PKInstaller):
         rally_node_ip = rally_node['ipaddress']
 
         command = self.config_manager.get_adapter_health_check_cmd()
+        command = command.replace('$cluster_name', cluster_name)
         option = '--url %s --clustername %s' % (callback_url, cluster_name)
         command = ' '.join((command, option))
 
diff --git a/conf/adapter/chef_openstack.conf b/conf/adapter/chef_openstack.conf
index f96e39c0..37e6a1a2 100644
--- a/conf/adapter/chef_openstack.conf
+++ b/conf/adapter/chef_openstack.conf
@@ -5,4 +5,4 @@ PACKAGE_INSTALLER = 'chef_installer'
 OS_INSTALLER = 'cobbler'
 SUPPORTED_OS_PATTERNS = ['(?i)centos.*', '(?i)ubuntu.*', '(?i)sles.*']
 DEPLOYABLE = True
-HEALTH_CHECK_COMMAND = 'python /opt/compass/health_check.py'
+HEALTH_CHECK_COMMAND = 'docker run -i -d $cluster_name python /opt/compass/rally/check_health.py'