diff --git a/ansible/roles/bifrost/tasks/bootstrap.yml b/ansible/roles/bifrost/tasks/bootstrap.yml
index 442cad658c703e3755bd7c04eb8b552fa8116a35..ce3b6f29fb910998005d12e879a94b316927a77f 100644
--- a/ansible/roles/bifrost/tasks/bootstrap.yml
+++ b/ansible/roles/bifrost/tasks/bootstrap.yml
@@ -15,7 +15,7 @@
 - name: Bootstrap bifrost (this may take several minutes)
   command: >
      docker exec bifrost_deploy
-     bash -c '/bifrost/scripts/env-setup.sh && source /bifrost/env-vars
+     bash -c 'source /bifrost/env-vars
      && cp /etc/bifrost/rabbitmq-env.conf /etc/rabbitmq/rabbitmq-env.conf &&
      chown rabbitmq:rabbitmq /etc/rabbitmq/rabbitmq-env.conf &&
      ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target
diff --git a/ansible/roles/bifrost/tasks/deploy-servers.yml b/ansible/roles/bifrost/tasks/deploy-servers.yml
index 0fbdd1d9eac58d8de52b230e28c0fa8fb9e156b2..879acfe0ffbcbd958806faa91d67ac4d65f793f6 100644
--- a/ansible/roles/bifrost/tasks/deploy-servers.yml
+++ b/ansible/roles/bifrost/tasks/deploy-servers.yml
@@ -2,8 +2,7 @@
 - name: Enrolling physical servers with ironic
   command: >
      docker exec bifrost_deploy
-     bash -c 'source /bifrost/env-vars
-     && source /opt/stack/ansible/hacking/env-setup &&
+     bash -c 'source /bifrost/env-vars &&
      export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml &&
      ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py
      /bifrost/playbooks/enroll-dynamic.yaml -e @/etc/bifrost/bifrost.yml'
@@ -11,8 +10,7 @@
 - name: Deploy physical servers with ironic
   command: >
      docker exec bifrost_deploy
-     bash -c 'source /bifrost/env-vars
-     && source /opt/stack/ansible/hacking/env-setup &&
+     bash -c 'source /bifrost/env-vars &&
      export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml &&
      ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py
      /bifrost/playbooks/deploy-dynamic.yaml -e @/etc/bifrost/bifrost.yml'