diff --git a/playbooks/groups/ipa.yml b/playbooks/groups/ipa.yml
index eeb5ddb7ad..bd0e775649 100644
--- a/playbooks/groups/ipa.yml
+++ b/playbooks/groups/ipa.yml
@@ -27,6 +27,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != 'staging'
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index ab402032b6..6cab1159c4 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -34,6 +34,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != 'staging'
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   # You might think we would want these tasks_path on the proxy nodes, but they