diff --git a/files/copr/copr_bashrc b/files/copr/copr_bashrc
index 5322be4136..6688ffedb6 100644
--- a/files/copr/copr_bashrc
+++ b/files/copr/copr_bashrc
@@ -5,6 +5,6 @@ if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
 fi
 
-if [ -f /srv/copr-work/copr/euca/eucarc ]; then
-     . /srv/copr-work/copr/euca/eucarc
+if [ -f /srv/copr-work/copr/cloud/ec2rc.sh ]; then
+     . /srv/copr-work/copr/cloud/ec2rc.sh
 fi
diff --git a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml
index 383ea60f67..b18408df5a 100644
--- a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml
@@ -74,12 +74,15 @@
   - name: make copr account
     action: user name=copr state=present system=yes home=/srv/copr-work/copr 
   
-  - name: setup euca goo in there
-    action: file state=directory path=/srv/copr-work/copr/euca owner=copr group=copr mode=0700
+  - name: setup dirs there
+    action: file state=directory path=/srv/copr-work/copr/$item owner=copr group=copr mode=0700
+    with_items: 
+    - cloud
+    - .ssh
 
   - name: add copr-buildsys keys to copr user path
-    action: copy src=$item dest=/srv/copr-work/copr/euca/ owner=copr group=copr mode=0600
-    with_fileglob: $private/files/euca/accounts/copr-buildsys/*
+    action: copy src=$item dest=/srv/copr-work/copr/cloud/ owner=copr group=copr mode=0600
+    with_fileglob: $private/files/openstack/copr-copr/*
 
   - name: setup privkey for copr user
     action: copy src=$private/files/copr/buildsys.priv dest=/srv/copr-work/copr/.ssh/id_rsa owner=copr group=copr mode=600