diff --git a/src/main/java/org/cloudifysource/esc/driver/provisioning/openstack2/OpenstackCloudDriver.java b/src/main/java/org/cloudifysource/esc/driver/provisioning/openstack2/OpenstackCloudDriver.java
index 03c3996..6a74249 100644
--- a/src/main/java/org/cloudifysource/esc/driver/provisioning/openstack2/OpenstackCloudDriver.java
+++ b/src/main/java/org/cloudifysource/esc/driver/provisioning/openstack2/OpenstackCloudDriver.java
@@ -579,7 +579,7 @@ private MachineDetails newServer(final String token, final long endTime, final C
 			md.setCloudifyInstalled(false);
 			md.setInstallationDirectory(serverTemplate.getRemoteDirectory());
 
-			md.setRemoteUsername("root");
+			md.setRemoteUsername(serverTemplate.getUsername());
 
 			return md;
 		} catch (final Exception e) {
diff --git a/src/test/resources/sample-cloud.groovy b/src/test/resources/sample-cloud.groovy
index 1b8c230..c3437a5 100755
--- a/src/test/resources/sample-cloud.groovy
+++ b/src/test/resources/sample-cloud.groovy
@@ -14,11 +14,10 @@ cloud {
 	provider {
 		// optional 
 		provider "openstack"
-		localDirectory "tools/cli/plugins/esc/sample/upload"
 		
-		cloudifyUrl "http://repository.cloudifysource.org/org/cloudifysource/2.1.1/gigaspaces-cloudify-2.1.1-ga-b1400.zip" 
+		cloudifyUrl "http://repository.cloudifysource.org/org/cloudifysource/2.2.0-RELEASE/gigaspaces-cloudify-2.2.0-ga-b2500" 
 		// create a archive with the driver in folder lib/plateform/esm
-		//cloudifyOverridesUrl "https://github.com/downloads/fastconnect/cloudify-openstack-driver/gigaspaces_overrides.zip"		
+		//cloudifyOverridesUrl "https://github.com/downloads/fastconnect/cloudify-openstack-driver/gigaspaces_overrides"		
 
 		// warning: '.' is not allowed
 		machineNamePrefix "cloudify-agent-"
@@ -37,8 +36,7 @@ cloud {
 	}
 	user {
 		user "LOGIN"
-		apiKey "PASSWORD"
-		keyFile "KEYPAIR.pem"
+		apiKey "PASSWORD"		
 	}
 	templates ([
 				MEDIUM_LINUX : template{
@@ -48,12 +46,18 @@ cloud {
 					// use "nova flavor-list" to find the id of the hardware
 					hardwareId "RegionOne/3"
 					remoteDirectory "/root/"
+					
+					localDirectory "upload"
+					
+					username="USERNAME"
 										
 					options ([
 						"openstack.securityGroup" : "default",
 						"openstack.keyPair" : "KEYPAIR_NAME"
 					])
 					
+					//privileged true
+					
 				}
 			])