diff --git a/inventory/group_vars/autosign b/inventory/group_vars/autosign
index 87e4cf7da4..f40296d32a 100644
--- a/inventory/group_vars/autosign
+++ b/inventory/group_vars/autosign
@@ -15,7 +15,6 @@ ansible_ifcfg_allowlist:
 - eth0
 - eth1
 
-fas_client_groups: sysadmin-releng
 host_group: autosign
 ipa_host_group: autosign
 ipa_host_group_desc: Hosts signing content automatically
diff --git a/playbooks/manual/autosign.yml b/playbooks/manual/autosign.yml
index 0fdb7111b1..edc40480b2 100644
--- a/playbooks/manual/autosign.yml
+++ b/playbooks/manual/autosign.yml
@@ -22,7 +22,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - { role: fas_client, when: env != "staging" }
+  - ipa/client
   - collectd/base
   - sudo
   - role: nfs/client
@@ -81,8 +81,6 @@
 
 
   tasks:
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: