diff --git a/manifests/compute.pp b/manifests/compute.pp
index 695d716..ffba633 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -28,7 +28,7 @@ class infracloud::compute(
   include ::apt
 
   class { '::openstack_extras::repo::debian::ubuntu':
-    release         => 'liberty',
+    release         => 'mitaka',
     package_require => true,
   }
 
@@ -54,9 +54,10 @@ class infracloud::compute(
 
   # nova.conf neutron credentials
   class { '::nova::network::neutron':
-    neutron_url            => "https://${controller_public_address}:9696",
-    neutron_admin_auth_url => "https://${controller_public_address}:35357/v2.0",
-    neutron_admin_password => $neutron_admin_password,
+    neutron_url         => "https://${controller_public_address}:9696",
+    neutron_auth_url    => "https://${controller_public_address}:35357",
+    neutron_auth_plugin => 'password',
+    neutron_password    => $neutron_admin_password,
   }
 
   # Libvirt parameters
diff --git a/manifests/controller.pp b/manifests/controller.pp
index b15cd10..efa2c44 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -44,7 +44,7 @@ class infracloud::controller(
   include ::apt
 
   class { '::openstack_extras::repo::debian::ubuntu':
-    release         => 'liberty',
+    release         => 'mitaka',
     package_require => true,
   }
 
@@ -237,11 +237,11 @@ class infracloud::controller(
 
   # neutron-server service and related neutron.conf and api-paste.conf params
   class { '::neutron::server':
-    auth_password       => $neutron_admin_password,
+    password            => $neutron_admin_password,
     database_connection => "mysql://neutron:${neutron_mysql_password}@127.0.0.1/neutron?charset=utf8",
     sync_db             => true,
     auth_uri            => $keystone_auth_uri,
-    identity_uri        => $keystone_admin_uri,
+    auth_url            => $keystone_admin_uri,
   }
 
   # neutron client package
@@ -249,11 +249,8 @@ class infracloud::controller(
 
   # neutron.conf nova credentials
   class { '::neutron::server::notifications':
-    nova_url               => "https://${controller_public_address}:8774/v2",
-    nova_admin_auth_url    => "${keystone_admin_uri}/v2.0",
-    nova_admin_username    => 'nova',
-    nova_admin_password    => $nova_admin_password,
-    nova_admin_tenant_name => 'services',
+    auth_url => $keystone_admin_uri,
+    password => $nova_admin_password,
   }
 
   # ML2
@@ -303,12 +300,17 @@ class infracloud::controller(
   ### Nova ###
 
   class { '::nova::db':
-    database_connection => "mysql://nova:${nova_mysql_password}@127.0.0.1/nova?charset=utf8",
+    database_connection     => "mysql://nova:${nova_mysql_password}@127.0.0.1/nova?charset=utf8",
+    api_database_connection => "mysql://nova_api:${nova_mysql_password}@127.0.0.1/nova_api?charset=utf8"
   }
   class { '::nova::db::mysql':
     password => $nova_mysql_password,
     host     => '127.0.0.1',
   }
+  class { '::nova::db::mysql_api':
+    password => $nova_mysql_password,
+    host     => '127.0.0.1',
+  }
 
   infracloud::rabbitmq_user { 'nova':
     password => $nova_rabbit_password,
@@ -344,9 +346,10 @@ class infracloud::controller(
 
   # nova.conf neutron credentials
   class { '::nova::network::neutron':
-    neutron_admin_auth_url => "https://${controller_public_address}:35357/v2.0",
-    neutron_admin_password => $neutron_admin_password,
-    neutron_url            => "https://${controller_public_address}:9696",
+    neutron_auth_url    => $keystone_admin_uri,
+    neutron_password    => $neutron_admin_password,
+    neutron_auth_plugin => 'password',
+    neutron_url         => "https://${controller_public_address}:9696",
   }
 
   # api service and endpoint-related params in nova.conf
diff --git a/spec/acceptance/allinone_spec.rb b/spec/acceptance/allinone_spec.rb
index c14624a..b5ad090 100644
--- a/spec/acceptance/allinone_spec.rb
+++ b/spec/acceptance/allinone_spec.rb
@@ -105,7 +105,7 @@ describe 'allinone', :if => os[:family] == 'ubuntu' do
   end
 
   it 'should be able to upload an image' do
-    command = 'openstack image create \
+    command = 'OS_IMAGE_API_VERSION=1 openstack image create \
       --copy-from http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img \
       --public \
       --container-format bare \