diff --git a/fuelweb_test/models/environment.py b/fuelweb_test/models/environment.py
index 194327b87..b11816d8f 100644
--- a/fuelweb_test/models/environment.py
+++ b/fuelweb_test/models/environment.py
@@ -555,19 +555,20 @@ class EnvironmentModel(object):
     def wait_bootstrap(self):
         logger.info("Waiting while bootstrapping is in progress")
         log_path = "/var/log/puppet/bootstrap_admin_node.log"
-        logger.info("Puppet timeout set in {0}".format(
-            float(settings.PUPPET_TIMEOUT)))
-        with self.d_env.get_admin_remote() as admin_remote:
+        logger.info("Running bootstrap (timeout: {0})".format(
+            float(settings.ADMIN_NODE_BOOTSTRAP_TIMEOUT)))
+        with TimeStat("admin_node_bootsrap_time", is_uniq=True):
             wait(
-                lambda: not
-                admin_remote.execute(
-                    "grep 'Fuel node deployment' '{:s}'".format(log_path)
-                )['exit_code'],
-                timeout=(float(settings.PUPPET_TIMEOUT))
+                lambda: self.ssh_manager.execute(
+                    ip=self.ssh_manager.admin_ip,
+                    cmd="grep 'Fuel node deployment' '{:s}'".format(log_path)
+                )['exit_code'] == 0,
+                timeout=(float(settings.ADMIN_NODE_BOOTSTRAP_TIMEOUT))
             )
-            result = admin_remote.execute(
-                "grep 'Fuel node deployment "
-                "complete' '{:s}'".format(log_path))['exit_code']
+        result = self.ssh_manager.execute(
+            ip=self.ssh_manager.admin_ip,
+            cmd="grep 'Fuel node deployment "
+            "complete' '{:s}'".format(log_path))['exit_code']
         if result != 0:
             raise Exception('Fuel node deployment failed.')
         self.bootstrap_image_check()
diff --git a/fuelweb_test/settings.py b/fuelweb_test/settings.py
index aae232202..de7a1ee01 100644
--- a/fuelweb_test/settings.py
+++ b/fuelweb_test/settings.py
@@ -82,7 +82,9 @@ WAIT_FOR_PROVISIONING_TIMEOUT = int(os.environ.get(
     "WAIT_FOR_PROVISIONING_TIMEOUT", 1200))
 
 ADMIN_NODE_SETUP_TIMEOUT = os.environ.get("ADMIN_NODE_SETUP_TIMEOUT", 30)
-PUPPET_TIMEOUT = os.environ.get("PUPPET_TIMEOUT", 6000)
+ADMIN_NODE_BOOTSTRAP_TIMEOUT = os.environ.get(
+    "ADMIN_NODE_BOOTSTRAP_TIMEOUT", 3600)
+
 
 HARDWARE = {
     "admin_node_memory": os.environ.get("ADMIN_NODE_MEMORY", 3072),