diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml
index f229bbedd6..a0184f3d96 100644
--- a/roles/copr/backend/tasks/main.yml
+++ b/roles/copr/backend/tasks/main.yml
@@ -80,6 +80,9 @@
   template: src="keystonerc" dest=/root/ owner=root group=root mode=600
   when: not devel
 
+- name: copy keystonerc for copr
+  template: src="keystonerc" dest=/home/copr/cloud/keystonerc_proper_tenant owner=copr group=copr mode=600
+
 - name: copy .boto file
   copy: src="boto" dest=/home/copr/.boto owner=copr group=copr
 
diff --git a/roles/copr/backend/templates/keystonerc b/roles/copr/backend/templates/keystonerc
index 1f7737a67e..20192e18e9 100644
--- a/roles/copr/backend/templates/keystonerc
+++ b/roles/copr/backend/templates/keystonerc
@@ -13,11 +13,11 @@ export OS_AUTH_URL=http://172.23.0.2:5000/v2.0
 # as the entity that owns the resources.
 
 export OS_TENANT_ID={{ copr_tenant_id }}
-export OS_TENANT_NAME="copr"
+export OS_TENANT_NAME={{ copr_tenant_name }}
 
 # In addition to the owning entity (tenant), openstack stores the entity
 # performing the action as the **user**.
-export OS_USERNAME=msuchy
+export OS_USERNAME=copr
 
 # With Keystone you pass the keystone password.
 export OS_PASSWORD={{ copr_nova_password }}