diff --git a/playbooks/hosts/artboard.fedorainfracloud.org.yml b/playbooks/hosts/artboard.fedorainfracloud.org.yml
index d985f8ae2b..9960ff2f75 100644
--- a/playbooks/hosts/artboard.fedorainfracloud.org.yml
+++ b/playbooks/hosts/artboard.fedorainfracloud.org.yml
@@ -28,6 +28,9 @@
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
 
+  roles:
+  - basessh
+
   tasks:
 
   - name: Install common scripts
diff --git a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml
index 1cadcd072c..32635ffe82 100644
--- a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml
@@ -27,6 +27,9 @@
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
+  roles:
+  - basessh
+
   tasks:
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: mount up blockerbugs-dev to /srv/persistent
diff --git a/playbooks/hosts/commops.fedorainfracloud.org.yml b/playbooks/hosts/commops.fedorainfracloud.org.yml
index 3db50b24b4..36326f4271 100644
--- a/playbooks/hosts/commops.fedorainfracloud.org.yml
+++ b/playbooks/hosts/commops.fedorainfracloud.org.yml
@@ -27,3 +27,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/communityblog.fedorainfracloud.org.yml b/playbooks/hosts/communityblog.fedorainfracloud.org.yml
index 8768ffee86..395facf832 100644
--- a/playbooks/hosts/communityblog.fedorainfracloud.org.yml
+++ b/playbooks/hosts/communityblog.fedorainfracloud.org.yml
@@ -28,6 +28,9 @@
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
 
+  roles:
+  - basessh
+
   tasks:
   - name: add packages
     yum: state=present name={{ item }}
diff --git a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml
index 440e0f4a8f..cf038777a0 100644
--- a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml
@@ -28,3 +28,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/developer.fedorainfracloud.org.yml b/playbooks/hosts/developer.fedorainfracloud.org.yml
index 7f4ff82c99..38b02f09fa 100644
--- a/playbooks/hosts/developer.fedorainfracloud.org.yml
+++ b/playbooks/hosts/developer.fedorainfracloud.org.yml
@@ -27,3 +27,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/eclipse.fedorainfracloud.org.yml b/playbooks/hosts/eclipse.fedorainfracloud.org.yml
index feca820997..760679fdd7 100644
--- a/playbooks/hosts/eclipse.fedorainfracloud.org.yml
+++ b/playbooks/hosts/eclipse.fedorainfracloud.org.yml
@@ -26,6 +26,9 @@
   pre_tasks:
   - include: "{{ tasks_path }}/yumrepos.yml"
 
+  roles:
+  - basessh
+
   tasks:
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
diff --git a/playbooks/hosts/faitout.fedorainfracloud.org.yml b/playbooks/hosts/faitout.fedorainfracloud.org.yml
index b86aa1f18b..abd6f7a6b3 100644
--- a/playbooks/hosts/faitout.fedorainfracloud.org.yml
+++ b/playbooks/hosts/faitout.fedorainfracloud.org.yml
@@ -27,3 +27,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml
index 8c0ed2d338..47a1fbdee1 100644
--- a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml
@@ -27,3 +27,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml
index c241360665..7d119084d0 100644
--- a/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml
@@ -27,3 +27,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml
index e6e934be35..235cdd819c 100644
--- a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml
@@ -34,3 +34,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml
index 273a015c2d..368a018491 100644
--- a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml
+++ b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml
@@ -28,6 +28,9 @@
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
 
+  roles:
+  - basessh
+
   tasks:
   - name: add packages
     yum: state=present name={{ item }}
diff --git a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml
index 7092b89dd9..97a96cbd57 100644
--- a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml
@@ -27,3 +27,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml b/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml
index 32fd8bd572..00a322ba2f 100644
--- a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml
@@ -49,6 +49,7 @@
 
 
   roles:
+  - basessh
   - certbot
 
   - role: hubs
diff --git a/playbooks/hosts/iddev.fedorainfracloud.org.yml b/playbooks/hosts/iddev.fedorainfracloud.org.yml
index fc8ff4d01e..3a6e602c16 100644
--- a/playbooks/hosts/iddev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/iddev.fedorainfracloud.org.yml
@@ -24,6 +24,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   roles:
+  - basessh
   - sudo
   - hosts
   - mod_wsgi
diff --git a/playbooks/hosts/insim.fedorainfracloud.org.yml b/playbooks/hosts/insim.fedorainfracloud.org.yml
index c72e978622..f4d9cd9f02 100644
--- a/playbooks/hosts/insim.fedorainfracloud.org.yml
+++ b/playbooks/hosts/insim.fedorainfracloud.org.yml
@@ -29,6 +29,9 @@
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
 
+  roles:
+  - basessh
+
   tasks:
   - name: install basic packages
     dnf: state=present pkg={{ item }}
diff --git a/playbooks/hosts/java-deptools.fedorainfracloud.org b/playbooks/hosts/java-deptools.fedorainfracloud.org
index d12225df67..9b22b424a1 100644
--- a/playbooks/hosts/java-deptools.fedorainfracloud.org
+++ b/playbooks/hosts/java-deptools.fedorainfracloud.org
@@ -27,3 +27,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     shell: "hostname {{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/kolinahr.fedorainfracloud.org.yml b/playbooks/hosts/kolinahr.fedorainfracloud.org.yml
index 65b4ec113a..35e88d0121 100644
--- a/playbooks/hosts/kolinahr.fedorainfracloud.org.yml
+++ b/playbooks/hosts/kolinahr.fedorainfracloud.org.yml
@@ -27,3 +27,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
index 009451f157..74f743dbb0 100644
--- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
@@ -33,6 +33,7 @@
     hostname: name="{{inventory_hostname}}"
 
   roles:
+  - basessh
   - sudo
   - hosts
   - mod_wsgi
diff --git a/playbooks/hosts/magazine2.fedorainfracloud.org.yml b/playbooks/hosts/magazine2.fedorainfracloud.org.yml
index 2b6dcc49ff..37b7b74a92 100644
--- a/playbooks/hosts/magazine2.fedorainfracloud.org.yml
+++ b/playbooks/hosts/magazine2.fedorainfracloud.org.yml
@@ -28,6 +28,9 @@
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
 
+  roles:
+  - basessh
+
   tasks:
   - name: add packages
     yum: state=present name={{ item }}
diff --git a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml
index 78366f5ebd..0c1abb1040 100644
--- a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml
+++ b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml
@@ -24,6 +24,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   roles:
+  - basessh
   - sudo
   - hosts
   - mod_wsgi
diff --git a/playbooks/hosts/modularity.fedorainfracloud.org.yml b/playbooks/hosts/modularity.fedorainfracloud.org.yml
index 7c7064b689..bb718f5d61 100644
--- a/playbooks/hosts/modularity.fedorainfracloud.org.yml
+++ b/playbooks/hosts/modularity.fedorainfracloud.org.yml
@@ -27,3 +27,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/piwik.fedorainfracloud.org.yml b/playbooks/hosts/piwik.fedorainfracloud.org.yml
index 01a36ff07e..78922c0ee5 100644
--- a/playbooks/hosts/piwik.fedorainfracloud.org.yml
+++ b/playbooks/hosts/piwik.fedorainfracloud.org.yml
@@ -27,6 +27,7 @@
   - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
+  - basessh
   - sudo
   - hosts
   - apache
diff --git a/playbooks/hosts/regcfp2.fedorainfracloud.org.yml b/playbooks/hosts/regcfp2.fedorainfracloud.org.yml
index 15ccb5d02b..e8022645a8 100644
--- a/playbooks/hosts/regcfp2.fedorainfracloud.org.yml
+++ b/playbooks/hosts/regcfp2.fedorainfracloud.org.yml
@@ -29,6 +29,7 @@
     hostname: name="{{inventory_hostname}}"
 
   roles:
+  - basessh
   - nagios_client
   - postgresql_server
   - regcfp
diff --git a/playbooks/hosts/respins.fedorainfracloud.org.yml b/playbooks/hosts/respins.fedorainfracloud.org.yml
index 2589df38d3..5d49b768eb 100644
--- a/playbooks/hosts/respins.fedorainfracloud.org.yml
+++ b/playbooks/hosts/respins.fedorainfracloud.org.yml
@@ -27,3 +27,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml
index 9b6a3d686b..d86f034c87 100644
--- a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml
@@ -24,6 +24,9 @@
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
+  roles:
+  - basessh
+
   tasks:
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - include: "{{ tasks_path }}/postfix_basic.yml"
diff --git a/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml b/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml
index 53ce075049..7d2112f82d 100644
--- a/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml
@@ -27,3 +27,6 @@
   - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+
+  roles:
+  - basessh
diff --git a/playbooks/hosts/taiga.fedorainfracloud.org.yml b/playbooks/hosts/taiga.fedorainfracloud.org.yml
index ac77e43173..7c860f5b81 100644
--- a/playbooks/hosts/taiga.fedorainfracloud.org.yml
+++ b/playbooks/hosts/taiga.fedorainfracloud.org.yml
@@ -27,6 +27,9 @@
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
 
+  roles:
+  - basessh
+
   roles:
   - role: taiga
     taiga_back_version: stable
diff --git a/playbooks/hosts/taigastg.fedorainfracloud.org.yml b/playbooks/hosts/taigastg.fedorainfracloud.org.yml
index 8a66ff21c8..6adb188d6f 100644
--- a/playbooks/hosts/taigastg.fedorainfracloud.org.yml
+++ b/playbooks/hosts/taigastg.fedorainfracloud.org.yml
@@ -28,6 +28,9 @@
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
 
+  roles:
+  - basessh
+
   roles:
   - role: taiga
     taiga_back_version: stable
diff --git a/playbooks/hosts/testdays.fedorainfracloud.org.yml b/playbooks/hosts/testdays.fedorainfracloud.org.yml
index 68146420af..10d67384bf 100644
--- a/playbooks/hosts/testdays.fedorainfracloud.org.yml
+++ b/playbooks/hosts/testdays.fedorainfracloud.org.yml
@@ -30,6 +30,7 @@
     hostname: name="{{inventory_hostname}}"
 
   roles:
+  - basessh
    - postgresql_server
 
 - name: configure resultsdb and testdays
diff --git a/playbooks/hosts/waiverdb-dev.fedorainfracloud.org.yml b/playbooks/hosts/waiverdb-dev.fedorainfracloud.org.yml
index 3ea6d2d682..b13ff0c41c 100644
--- a/playbooks/hosts/waiverdb-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/waiverdb-dev.fedorainfracloud.org.yml
@@ -32,5 +32,6 @@
   - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
+  - basessh
   - nginx
   - waiverdb