diff --git a/ansible/install/group_vars/all b/ansible/install/group_vars/all
index 6497fba3a..7d508e8fe 100644
--- a/ansible/install/group_vars/all
+++ b/ansible/install/group_vars/all
@@ -1,8 +1,14 @@
 ---
 centos_image: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
+
 connmon_host: 192.0.2.1
+
 dns_server: 8.8.8.8
-pbench_repo_file_url: http://pbench.example.com/repo/yum.repos.d/pbench.repo
+
+# pbench repos, you must replace the internal to the correct repo to install pbench
+pbench_internal_repo_file_url: http://pbench.example.com/repo/yum.repos.d/pbench.repo
+pbench_repo_file_url: https://copr.fedoraproject.org/coprs/ndokos/pbench/repo/epel-7/ndokos-pbench-epel-7.repo
+configtools_repo_file_url: https://copr.fedoraproject.org/coprs/ndokos/configtools/repo/epel-7/ndokos-configtools-epel-7.repo
 
 # Enterprise Linux Repo name.  Copied from undercloud to controllers for
 # installing any pbench dependencies
diff --git a/ansible/install/pbench.yml b/ansible/install/pbench.yml
index 336b16966..03ff2590b 100644
--- a/ansible/install/pbench.yml
+++ b/ansible/install/pbench.yml
@@ -5,6 +5,7 @@
 
 - hosts: undercloud
   remote_user: stack
+  gather_facts: false
   vars:
     ansible_sudo: true
     undercloud: true
@@ -12,8 +13,9 @@
   - common
   - pbench
 
-- hosts: controller
+- hosts: controller:compute
   remote_user: heat-admin
+  gather_facts: false
   vars:
     ansible_sudo: true
     undercloud: false
diff --git a/ansible/install/roles/pbench/tasks/main.yml b/ansible/install/roles/pbench/tasks/main.yml
index 6dc60291c..adfdfa550 100644
--- a/ansible/install/roles/pbench/tasks/main.yml
+++ b/ansible/install/roles/pbench/tasks/main.yml
@@ -12,18 +12,28 @@
   copy: src=el.repo dest=/etc/yum.repos.d/
   when: not undercloud
 
-- name: Install pbench repo file
+- name: Install internal pbench repo file
+  get_url: url="{{ pbench_internal_repo_file_url }}" dest=/etc/yum.repos.d/pbench-internal.repo
+
+- name: Install pbench copr repo file
   get_url: url="{{ pbench_repo_file_url }}" dest=/etc/yum.repos.d/pbench.repo
 
+- name: Install configtools copr repo file
+  get_url: url="{{ configtools_repo_file_url }}" dest=/etc/yum.repos.d/configtools.repo
+
 - name: Install pbench-agent
-  yum: name=pbench-agent state=latest
+  yum: name=pbench-agent-internal state=latest
 
 - name: Ensure pbench directory exists as stack user on undercloud
   file: path=/var/lib/pbench-agent state=directory owner=stack group=stack recurse=yes
   when: undercloud
 
+- name: Ensure pbench tools-default directory exists as stack user on undercloud
+  file: path=/var/lib/pbench-agent/tools-default state=directory owner=stack group=stack recurse=yes
+  when: undercloud
+
 - name: Ensure pbench id_rsa is owned by stack
-  file: path=/opt/pbench-agent/id_rsa owner=stack group=stack
+  file: path=/opt/pbench-agent/id_rsa owner=stack group=stack mode=0600
   when: undercloud
 
 - name: Get undercloud root ssh public key