diff --git a/roles/totpcgi/tasks/main.yml b/roles/totpcgi/tasks/main.yml
index 9aab599765..e51c4add8a 100644
--- a/roles/totpcgi/tasks/main.yml
+++ b/roles/totpcgi/tasks/main.yml
@@ -34,28 +34,6 @@
   - pki/totpcgi
   - totpcgi/totp
 
-- name: install totpcgi key and cert
-  copy: src="{{ puppet_private }}/{{ item.file }}" dest="{{ item.dest }}"
-        owner=fas group=fas mode=0400
-  with_items:
-  - {file: 2fa-certs/keys/fas-all.stg.phx2.fedoraproject.org.crt, dest: /etc/pki/totpcgi/totpcgi-server.crt }
-  - {file: 2fa-certs/keys/fas-all.stg.phx2.fedoraproject.org.key, dest: /etc/pki/totpcgi/totpcgi-server.key }
-  - {file: 2fa-certs/keys/ca.crt, dest: /etc/pki/totpcgi/totpcgi-ca.crt }
-  when: master_fas_node == True and env == 'staging'
-  tags:
-  - config
-
-- name: install totpcgi key and cert
-  copy: src="{{ puppet_private }}/{{ item.file }}" dest="{{ item.dest }}"
-        owner=fas group=fas mode=0400
-  with_items:
-  - {file: 2fa-certs/keys/fas-all.phx2.fedoraproject.org.crt, dest: /etc/pki/totpcgi/totpcgi-server.crt }
-  - {file: 2fa-certs/keys/fas-all.phx2.fedoraproject.org.key, dest: /etc/pki/totpcgi/totpcgi-server.key }
-  - {file: 2fa-certs/keys/ca.crt, dest: /etc/pki/totpcgi/totpcgi-ca.crt }
-  when: master_fas_node == True and env != 'staging'
-  tags:
-  - config
-
 - name: create template directory for totpcgiprov
   file: path=/etc/{{ item }} state=directory owner=root group=totpcgiprov mode=750
   with_items:
@@ -122,7 +100,7 @@
   tags:
   - files
   - config
-  when: env == "staging" and master_fas_node != True
+  when: env == "staging"
 
 - name: copy staging server key file over
   copy: >
@@ -134,7 +112,7 @@
   tags:
   - files
   - config
-  when: env == "staging" and master_fas_node != True
+  when: env == "staging"
 
 - name: copy staging server conf file over
   copy: >
@@ -176,9 +154,9 @@
   - config
   notify:
   - restart httpd
-  when: env == "production" and master_fas_node != True
+  when: env == "production"
 
-- name: copy server cert file over
+- name: copy totpcgi httpd config
   copy: >
    src=totpcgi-httpd.conf
    dest=/etc/httpd/conf.d/totpcgi.conf
@@ -190,7 +168,7 @@
   - config
   notify:
   - restart httpd
-  when: env == "production" and master_fas_node != True
+  when: env == "production"
 
 # vpn certs