diff --git a/ansible/oooq/roles/template-configs/templates/browbeat-yoda-ci.yaml.j2 b/ansible/oooq/roles/template-configs/templates/browbeat-yoda-ci.yaml.j2
index 0febdb172..2c0dc4c3f 100644
--- a/ansible/oooq/roles/template-configs/templates/browbeat-yoda-ci.yaml.j2
+++ b/ansible/oooq/roles/template-configs/templates/browbeat-yoda-ci.yaml.j2
@@ -4,6 +4,7 @@ browbeat:
   results : results/
   rerun: 1
   cloud_name: {{ browbeat_cloud_name }}
+  overcloud_credentials: /home/stack/overcloudrc
 elasticsearch:
   enabled: {{ elastic_enabled }}
   host: {{ elastic_host }}
@@ -44,7 +45,6 @@ yoda:
   enabled: true
   instackenv: "/home/stack/instackenv.json"
   stackrc: "/home/stack/stackrc"
-  venv: "/home/stack/yoda-venv/bin/activate"
   benchmarks:
     - name: introspect-{{ overcloud_size }}-batch-5
       type: introspection
@@ -59,58 +59,6 @@ yoda:
       method: bulk
       times: 3
       timeout: 1800
-    - name: No-HA-Max-Compute-{{ overcloud_size }}-full-deploy
-      type: overcloud
-      ntp_server: pool.ntp.org
-      timeout: 600
-      templates:
-        - ""
-      enabled: true
-      step: 5
-      keep_stack: false
-      times: 1
-      cloud:
-        - node: "compute"
-          start_scale: 1
-          end_scale: {{ overcloud_size | int - 1 }}
-        - node: "control"
-          start_scale: 1
-          end_scale: 1
-    - name: No-HA-Max-Compute-{{ overcloud_size }}-stack-update
-      type: overcloud
-      ntp_server: pool.ntp.org
-      timeout: 600
-      templates:
-        - ""
-      instackenv: "/home/stack/instackenv.json"
-      enabled: true
-      step: 5
-      keep_stack: true
-      times: 1
-      cloud:
-        - node: "compute"
-          start_scale: 1
-          end_scale: {{ overcloud_size | int - 1 }}
-        - node: "control"
-          start_scale: 1
-          end_scale: 1
-    - name: HA-Max-Compute-{{ overcloud_size }}-full-deploy
-      type: overcloud
-      ntp_server: pool.ntp.org
-      timeout: 600
-      templates:
-        - ""
-      enabled: true
-      step: 5
-      keep_stack: false
-      times: 1
-      cloud:
-        - node: "compute"
-          start_scale: 1
-          end_scale: {{ overcloud_size | int - 3 }}
-        - node: "control"
-          start_scale: 3
-          end_scale: 3
     - name: HA-Max-Compute-{{ overcloud_size }}-stack-update
       type: overcloud
       ntp_server: pool.ntp.org
@@ -118,29 +66,12 @@ yoda:
       templates:
         - ""
       enabled: true
-      step: 5
+      step: 1
       keep_stack: true
       times: 1
       cloud:
         - node: "compute"
-          start_scale: 1
-          end_scale: {{ overcloud_size | int - 3 }}
-        - node: "control"
-          start_scale: 3
-          end_scale: 3
-    - name: HA-Max-Compute-{{ overcloud_size }}-stack-update
-      type: overcloud
-      ntp_server: pool.ntp.org
-      timeout: 600
-      templates:
-        - ""
-      enabled: true
-      step: 5
-      keep_stack: true
-      times: 1
-      cloud:
-        - node: "compute"
-          start_scale: 1
+          start_scale: {{ overcloud_size | int - 3 }}
           end_scale: {{ overcloud_size | int - 3 }}
         - node: "control"
           start_scale: 3
diff --git a/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2 b/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2
index 2053db111..6c159577d 100644
--- a/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2
+++ b/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2
@@ -44,7 +44,6 @@ yoda:
   enabled: true
   instackenv: "/home/stack/instackenv.json"
   stackrc: "/home/stack/stackrc"
-  venv: "/home/stack/yoda-venv/bin/activate"
   benchmarks:
     - name: introspect-{{ overcloud_size }}-10-individual-batch-2
       type: introspection
diff --git a/lib/Yoda.py b/lib/Yoda.py
index 15468ecbe..3f59b2f98 100644
--- a/lib/Yoda.py
+++ b/lib/Yoda.py
@@ -325,7 +325,7 @@ class Yoda(WorkloadBase.WorkloadBase):
                 wait_time += 10
                 if wait_time > timeout:
                     self.logger.error("Overcloud stack delete failed")
-                exit(1)
+                    exit(1)
         except exceptions.SDKException:
             # Recursion is probably the wrong way to handle this
             self.logger.error("Heat failure during overcloud delete, retrying")
@@ -436,8 +436,11 @@ class Yoda(WorkloadBase.WorkloadBase):
                     # even if nodes are never pingable
                     rentry['ping_time'] = -1
                     condition = 'private' in node.addresses
+                    if condition:
+                      ping = self.tools.is_pingable(node.addresses['private'])
+                    else:
+                      ping = False
                     condition = condition and 'pingable_at' not in rentry
-                    ping = self.tools.is_pingable(node.addresses['private'])
                     condition = condition and ping
                     if condition:
                       ping_time = datetime.datetime.utcnow()
diff --git a/lib/validate.yaml b/lib/validate.yaml
index 14714142a..007adcf87 100644
--- a/lib/validate.yaml
+++ b/lib/validate.yaml
@@ -300,9 +300,6 @@ mapping:
       stackrc:
         type: str
         required: True
-      venv:
-        type: str
-        required: True
       benchmarks:
         type: seq
         required: True