diff --git a/getenvsetup.sh b/getenvsetup.sh
index 538fbae5e089d8b8a7d30b1eafbe411ab9e7c776..145af743438460568d5f100ac62abcfd639e5ff8 100755
--- a/getenvsetup.sh
+++ b/getenvsetup.sh
@@ -46,10 +46,12 @@ cd /root/envsetup || exit
 # activation key
 read -r -p "Activation key (e.g. XXX-XXX-XXX-XXX): " key
 if [ "$key" ]; then
-    cp -u /root/envsetup/inventories/local-${target}/host_vars/localhost.dist.yml /root/envsetup/inventories/local-${target}/host_vars/localhost.yml
+    cp -u /root/envsetup/inventories/local-${target}/host_vars/localhost.{dist.yml,yml}
+    # temp fix while waiting for envsetup3 to be merged into stable
+    test -f site.yml || git checkout master
     sed -i "s/skyreach_activation_key:.*/skyreach_activation_key: ${key}/g" /root/envsetup/inventories/local-${target}/host_vars/localhost.yml
 fi
 
 # deploy target
-make requirements
+make install
 make deploy i=inventories/local-${target}