diff --git a/launch-node.sh b/launch-node.sh
index 4b724d8..705ceac 100755
--- a/launch-node.sh
+++ b/launch-node.sh
@@ -3,10 +3,10 @@
 set -eux
 
 THISDIR=$(dirname $(readlink -f $0))
-KEY_NAME="matekey"
-KEY_PATH="$(pwd)/../xenapi-in-the-cloud/$KEY_NAME.pem"
+KEY_NAME="$1"
+KEY_PATH="$2"
 IMAGE="node"
-INSTANCE_NAME="$1"
+INSTANCE_NAME="$3"
 
 . $THISDIR/functions
 
diff --git a/update-node-image.sh b/update-node-image.sh
index cef85df..8742159 100755
--- a/update-node-image.sh
+++ b/update-node-image.sh
@@ -6,9 +6,9 @@ THISDIR=$(dirname $(readlink -f $0))
 
 XENSERVER_PASSWORD="password"
 APPLIANCE_URL="http://downloads.vmd.citrix.com/OpenStack/xenapi-in-the-cloud-appliances/1.0.0.xva"
-KEY_NAME="matekey"
-KEY_PATH="$(pwd)/../xenapi-in-the-cloud/$KEY_NAME.pem"
-INSTANCE_NAME="$1"
+KEY_NAME="$1"
+KEY_PATH="$2"
+INSTANCE_NAME="$3"
 NODE_IMAGE="node"
 
 # Use this configuration to start with a cloud image