diff --git a/Gemfile b/Gemfile
index b378c2b8..e8767e6c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,6 @@ group :development do
   gem 'mixlib-shellout'
   gem 'active_support'
   gem 'activesupport'
-  gem 'knife-cloud', :git => 'https://github.com/ClogenyTechnologies/knife-cloud.git', :branch => 'bootstrap'
+  gem 'knife-cloud', :git => 'https://github.com/opscode/knife-cloud.git'
   gem 'knife-windows', :git => 'https://github.com/opscode/knife-windows.git', :branch => 'knife-cloud'
 end
diff --git a/spec/functional/server_create_func_spec.rb b/spec/functional/server_create_func_spec.rb
index 7f54a9c6..33ff4be6 100644
--- a/spec/functional/server_create_func_spec.rb
+++ b/spec/functional/server_create_func_spec.rb
@@ -56,7 +56,7 @@
 
   describe "run" do
     before(:each) do
-      @knife_openstack_create.stub(:validate!)
+      @knife_openstack_create.stub(:validate_params!)
       Fog::Compute::OpenStack.stub_chain(:new, :servers, :create).and_return(@new_openstack_server)
       @knife_openstack_create.config[:openstack_floating_ip] = '-1'
       @new_openstack_server.stub(:wait_for)
diff --git a/spec/integration/openstack_spec.rb b/spec/integration/openstack_spec.rb
index 4f4a3591..bb307185 100644
--- a/spec/integration/openstack_spec.rb
+++ b/spec/integration/openstack_spec.rb
@@ -273,7 +273,7 @@ def rm_known_host
         end
       end
 
-      context 'create server with --private-network option' do
+      context 'create server with --openstack-private-network option' do
         cmd_out = ""
         before(:each) { create_node_name("linux") }
         let(:command) { "knife openstack server create -N #{@name_node}"+
@@ -283,7 +283,7 @@ def rm_known_host
         " --yes" +
         get_ssh_credentials +
         " --identity-file #{temp_dir}/openstack.pem"+
-        " --private-network"+
+        " --openstack-private-network"+
         append_openstack_creds() }
         after(:each)  { run(delete_instance_cmd("#{cmd_stdout}")) }
         it 'should bootstrap sucessfully with private ip address.' do
@@ -292,7 +292,7 @@ def rm_known_host
         end
       end
 
-      context 'create server with --floating-ip option' do
+      context 'create server with --openstack-floating-ip option' do
         cmd_out = ""
         before(:each) { create_node_name("linux") }
         let(:command) { "knife openstack server create -N #{@name_node}"+
@@ -302,7 +302,7 @@ def rm_known_host
         " --yes" +
         get_ssh_credentials +
         " --identity-file #{temp_dir}/openstack.pem"+
-        " --floating-ip"+
+        " --openstack-floating-ip"+
         append_openstack_creds() }
         after(:each)  { run(delete_instance_cmd("#{cmd_stdout}")) }
         it 'should associate a floating IP address to the new OpenStack node.' do
@@ -415,7 +415,7 @@ def rm_known_host
         " --identity-file #{temp_dir}/openstack.pem"+
         " --ssh-key #{@openstack_config['os_ssh_params']['key_pair']}"+
         get_ssh_credentials_for_windows_image+
-        append_openstack_creds() }
+        append_openstack_creds() + " --image-os-type windows" }
         after(:each)  { run(delete_instance_cmd("#{cmd_stdout}")) }
         it 'successfully create the (windows VM) server with the provided options and bootstrap.' do
           pending 'not yet implemented'
@@ -502,7 +502,7 @@ def rm_known_host
         end
       end
 
-      context 'create server (for windows) with --private-network option' do
+      context 'create server (for windows) with --openstack-private-network option' do
         cmd_out = ""
         before(:each) { create_node_name("windows") }
         let(:command) { "knife openstack server create -N #{@name_node}"+
@@ -514,7 +514,7 @@ def rm_known_host
         " --bootstrap-protocol winrm" +
         get_winrm_credentials+
         " --identity-file #{temp_dir}/openstack.pem"+
-        " --private-network"+
+        " --openstack-private-network"+
         append_openstack_creds() }
         after(:each)  { run(delete_instance_cmd("#{cmd_stdout}")) }
         it 'should bootstrap sucessfully with private ip address.' do
@@ -523,7 +523,7 @@ def rm_known_host
         end
       end
 
-      context 'create server (for windows) with --floating-ip option' do
+      context 'create server (for windows) with --openstack-floating-ip option' do
         cmd_out = ""
         before(:each) { create_node_name("windows") }
         let(:command) { "knife openstack server create -N #{@name_node}"+
@@ -535,7 +535,7 @@ def rm_known_host
         " --bootstrap-protocol winrm" +
         get_winrm_credentials+
         " --identity-file #{temp_dir}/openstack.pem"+
-        " --floating-ip"+
+        " --openstack-floating-ip"+
         append_openstack_creds() }
         after(:each)  { run(delete_instance_cmd("#{cmd_stdout}")) }
         it 'should associate a floating IP address to the new OpenStack node.' do