diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 1313dbed84..27464bcca6 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -5,6 +5,10 @@
   sudo: yes
   gather_facts: True
 
+  vars:
+   all_tenants: ['cloudintern', 'cloudsig', 'copr', 'coprdev', 'infrastructure',
+      'persistent', 'pythonbots', 'qa', 'scratch', 'transient']
+
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
@@ -548,6 +552,13 @@
       - { name: tflink, email: 'tflink@fedoraproject.org', tenant: qa, password: "{{tflink_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas tflink') }}" }
       - { name: atomic, email: 'walters@redhat.com', tenant: scratch, password: "{{cockpit_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas walters') }}" }
 #      - { name: twisted, email: 'buildbot@twistedmatrix.com', tenant: pythonbots, password: "{{twisted_password}}", public_key: "" }
+  - name: upload SSH keys for admin
+    nova_keypair:
+      auth_url="https://{{controller_hostname}}:35357/v2.0"
+      login_username="admin"
+      login_password="{{ ADMIN_PASS }}" login_tenant_name="{{item}}" name="fedora-admin-20130801"
+      public_key="{{ lookup('file', files + '/fedora-cloud/fedora-admin-20130801.pub') }}"
+    with_items: all_tenants
 
   - name: Create roles for additional tenants
     shell: source /root/keystonerc_admin && keystone role-list |grep ' {{item}} ' || keystone role-create --name {{ item }}