diff --git a/spring-boot-bootstrap/pom.xml b/spring-boot-bootstrap/pom.xml
index c1ce4df6e2..b5bcc587b1 100644
--- a/spring-boot-bootstrap/pom.xml
+++ b/spring-boot-bootstrap/pom.xml
@@ -78,6 +78,43 @@
     </dependencies>
 
     <profiles>
+        <profile>
+            <id>cloud-gcp</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-gcp-starter</artifactId>
+                    <version>1.0.0.RELEASE</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-gcp-starter-sql-mysql</artifactId>
+                    <version>1.0.0.RELEASE</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <finalName>${project.name}-gcp</finalName>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <excludes>
+                            <exclude>**/logback.xml</exclude>
+                        </excludes>
+                    </resource>
+                </resources>
+                <plugins>
+                    <plugin>
+                        <groupId>com.google.cloud.tools</groupId>
+                        <artifactId>appengine-maven-plugin</artifactId>
+                        <version>1.3.2</version>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>cloudfoundry</id>
             <dependencies>
@@ -91,6 +128,7 @@
                 </dependency>
             </dependencies>
             <build>
+                <finalName>${project.name}-cf</finalName>
                 <resources>
                     <resource>
                         <directory>src/main/resources</directory>
@@ -103,9 +141,6 @@
                     <plugin>
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
-                        <configuration>
-                            <finalName>${project.name}-cf</finalName>
-                        </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
diff --git a/spring-boot-bootstrap/src/main/appengine/app.yaml b/spring-boot-bootstrap/src/main/appengine/app.yaml
new file mode 100644
index 0000000000..a65ec6533a
--- /dev/null
+++ b/spring-boot-bootstrap/src/main/appengine/app.yaml
@@ -0,0 +1,19 @@
+runtime: java
+env: flex
+runtime_config:
+  jdk: openjdk8
+env_variables:
+  SPRING_PROFILES_ACTIVE: "gcp,mysql"
+handlers:
+- url: /.*
+  script: this field is required, but ignored
+resources:
+  cpu: 2
+  memory_gb: 2
+  disk_size_gb: 10
+  volumes:
+  - name: ramdisk1
+    volume_type: tmpfs
+    size_gb: 0.5
+manual_scaling:
+  instances: 1
diff --git a/spring-boot-bootstrap/src/main/resources/application-gcp.properties b/spring-boot-bootstrap/src/main/resources/application-gcp.properties
new file mode 100644
index 0000000000..3dd11eeb8c
--- /dev/null
+++ b/spring-boot-bootstrap/src/main/resources/application-gcp.properties
@@ -0,0 +1,3 @@
+spring.cloud.gcp.sql.instance-connection-name=baeldung-spring-boot-bootstrap:europe-west2:baeldung-spring-boot-bootstrap-db
+spring.cloud.gcp.sql.database-name=baeldung_bootstrap_db
+spring.cloud.gcp.logging.enabled=true
\ No newline at end of file
diff --git a/spring-boot-bootstrap/src/main/resources/application.properties b/spring-boot-bootstrap/src/main/resources/application.properties
index eee89ca460..d83166d843 100644
--- a/spring-boot-bootstrap/src/main/resources/application.properties
+++ b/spring-boot-bootstrap/src/main/resources/application.properties
@@ -8,4 +8,5 @@ spring.thymeleaf.suffix=.html
 server.error.path=/error
 server.error.whitelabel.enabled=false 
 
-spring.jpa.generate-ddl=true
\ No newline at end of file
+spring.jpa.generate-ddl=true
+spring.jpa.hibernate.ddl-auto=update
\ No newline at end of file
diff --git a/spring-boot-bootstrap/src/main/resources/logback-gcp.xml b/spring-boot-bootstrap/src/main/resources/logback-gcp.xml
new file mode 100644
index 0000000000..9a9c1c633d
--- /dev/null
+++ b/spring-boot-bootstrap/src/main/resources/logback-gcp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/cloud/gcp/autoconfigure/logging/logback-appender.xml" />
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+
+    <root level="INFO">
+        <!-- If running in GCP, remove the CONSOLE appender otherwise logs will be duplicated. -->
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="STACKDRIVER" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/spring-boot-bootstrap/src/main/resources/spring-cloud-bootstrap.properties b/spring-boot-bootstrap/src/main/resources/spring-cloud-bootstrap.properties
new file mode 100644
index 0000000000..6ba0b5ffcc
--- /dev/null
+++ b/spring-boot-bootstrap/src/main/resources/spring-cloud-bootstrap.properties
@@ -0,0 +1 @@
+spring.cloud.appId=baeldung-spring-boot-bootstrap