diff --git a/developer/pom.xml b/developer/pom.xml
index 37120feee6f..eb6e11234c8 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -10,7 +10,6 @@
 	language governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.cloudstack</groupId>
 	<artifactId>cloud-developer</artifactId>
 	<name>Apache CloudStack Developer Tools</name>
 	<packaging>pom</packaging>
@@ -75,6 +74,11 @@
 											<fileset dir="${project.basedir}/../setup/db/">
 											</fileset>
 										</copy>
+                                        <copy todir="${basedir}/target/db" filtering="true">
+                                            <fileset dir="${project.basedir}/../awsapi-setup/db/mysql/">
+                                              <include name="**/*.sql" />
+                                            </fileset>
+                                        </copy>
 									</target>
 								</configuration>
 							</execution>
@@ -154,6 +158,32 @@
                                     <url>jdbc:mysql://${db.cloud.host}:${db.cloud.port}</url>
                                     <sqlCommand>create database `cloud_usage`</sqlCommand>
                                 </configuration>
+                            </execution>
+                            <execution>
+                                <id>drop-database-cloudbridge</id>
+                                <phase>process-test-resources</phase>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                                <configuration>
+                                    <username>root</username>
+                                    <password>${db.cloud.password}</password>
+                                    <url>jdbc:mysql://${db.cloud.host}:${db.cloud.port}</url>
+                                    <sqlCommand>drop database if exists `cloudbridge`</sqlCommand>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>create-database-cloudbridge</id>
+                                <phase>process-test-resources</phase>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                                <configuration>
+                                    <username>root</username>
+                                    <password>${db.cloud.password}</password>
+                                    <url>jdbc:mysql://${db.cloud.host}:${db.cloud.port}</url>
+                                    <sqlCommand>create database `cloudbridge`</sqlCommand>
+                                </configuration>
                             </execution>
 							<execution>
 								<id>create-schema</id>
@@ -167,6 +197,14 @@
 										<srcFile>${basedir}/target/db/create-schema-premium.sql</srcFile>
 										<srcFile>${basedir}/target/db/templates.sql</srcFile>
 										<srcFile>${basedir}/target/db/create-index-fk.sql</srcFile>
+										<srcFile>${basedir}/target/db/cloudbridge_schema.sql</srcFile>
+										<srcFile>${basedir}/target/db/cloudbridge_multipart.sql</srcFile>
+										<srcFile>${basedir}/target/db/cloudbridge_index.sql</srcFile>
+										<srcFile>${basedir}/target/db/cloudbridge_multipart_alter.sql</srcFile>
+										<srcFile>${basedir}/target/db/cloudbridge_bucketpolicy.sql</srcFile>
+										<srcFile>${basedir}/target/db/cloudbridge_policy_alter.sql</srcFile>
+										<srcFile>${basedir}/target/db/cloudbridge_offering.sql</srcFile>
+										<srcFile>${basedir}/target/db/cloudbridge_offering_alter.sql</srcFile>
 									</srcFiles>
 								</configuration>
 							</execution>