diff --git a/src/jetstream/datastore/datastore.go b/src/jetstream/datastore/datastore.go
index d372adce51..3eb21bd744 100644
--- a/src/jetstream/datastore/datastore.go
+++ b/src/jetstream/datastore/datastore.go
@@ -6,8 +6,10 @@ import (
 	"os"
 	"regexp"
 	"strings"
+	"time"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/config"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/goose-db-version"
 
 	log "github.com/sirupsen/logrus"
 	// Mysql driver
@@ -26,6 +28,9 @@ const (
 	PGSQL = "pgsql"
 	// MYSQL DB Provider
 	MYSQL = "mysql"
+
+	// TimeoutBoundary is the max time in minutes to wait for the DB Schema to be initialized
+	TimeoutBoundary = 10
 )
 
 // DatabaseConfig represents the connection configuration parameters
@@ -144,6 +149,7 @@ func GetConnection(dc DatabaseConfig) (*sql.DB, error) {
 	return GetSQLLiteConnection()
 }
 
+// GetSQLLiteConnection returns an SQLite DB Connection
 func GetSQLLiteConnection() (*sql.DB, error) {
 
 	if !config.IsSet("SQLITE_KEEP_DB") {
@@ -258,3 +264,44 @@ func ModifySQLStatement(sql string, databaseProvider string) string {
 	// Default is to return the SQL provided directly
 	return sql
 }
+
+// WaitForMigrations will wait until all migrations have been applied
+func WaitForMigrations(db *sql.DB) error {
+	migrations := GetOrderedMigrations()
+	targetVersion := migrations[len(migrations)-1]
+
+	// Timeout after which we will give up
+	timeout := time.Now().Add(time.Minute * TimeoutBoundary)
+
+	for {
+		dbVersionRepo, _ := goosedbversion.NewPostgresGooseDBVersionRepository(db)
+		databaseVersionRec, err := dbVersionRepo.GetCurrentVersion()
+		if err != nil {
+			var errorMsg = err.Error()
+			if strings.Contains(err.Error(), "no such table") {
+				errorMsg = "Waiting for versions table to be created"
+			} else if strings.Contains(err.Error(), "No database versions found") {
+				errorMsg = "Versions table is empty - waiting for migrations"
+			}
+			log.Infof("Database schema check: %s", errorMsg)
+		} else if databaseVersionRec.VersionID == targetVersion.Version {
+			log.Info("Database schema is up to date")
+			break
+		} else {
+			log.Info("Waiting for database schema to be initialized")
+		}
+
+		// If our timeout boundary has been exceeded, bail out
+		if timeout.Sub(time.Now()) < 0 {
+			// If we timed out and the last request was a db error, show the error
+			if err != nil {
+				log.Error(err)
+			}
+			return fmt.Errorf("Timed out waiting for database schema to be initialized")
+		}
+
+		time.Sleep(3 * time.Second)
+	}
+
+	return nil
+}
diff --git a/src/jetstream/datastore/datastore_migrator.go b/src/jetstream/datastore/datastore_migrator.go
index 6483c8acd8..1a03f59190 100644
--- a/src/jetstream/datastore/datastore_migrator.go
+++ b/src/jetstream/datastore/datastore_migrator.go
@@ -30,8 +30,8 @@ type stratosMigrationStep struct {
 
 var migrationSteps []stratosMigrationStep
 
-// getOrderedMigrations returns an order list of migrations to run
-func getOrderedMigrations() []stratosMigrationStep {
+// GetOrderedMigrations returns an order list of migrations to run
+func GetOrderedMigrations() []stratosMigrationStep {
 	sort.Slice(migrationSteps, func(i, j int) bool {
 		return migrationSteps[i].Version < migrationSteps[j].Version
 	})
@@ -51,7 +51,7 @@ func ApplyMigrations(conf *goose.DBConf, db *sql.DB) error {
 	log.Printf("Database provider: %s", conf.Driver.Name)
 	log.Printf("Current %d", current)
 
-	stratosMigrations := getOrderedMigrations()
+	stratosMigrations := GetOrderedMigrations()
 
 	if len(stratosMigrations) == 0 {
 		return fmt.Errorf("No Database Migrations found")
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 8bfe2a8153..351bbc2b74 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -151,6 +151,11 @@ func main() {
 	}()
 	log.Info("Database connection pool created.")
 
+	// Wait for Database Schema to be initialized (or exit if this times out)
+	if err = datastore.WaitForMigrations(databaseConnectionPool); err != nil {
+		log.Fatal(err)
+	}
+
 	// Initialize session store for Gorilla sessions
 	sessionStore, sessionStoreOptions, err := initSessionStore(databaseConnectionPool, dc.DatabaseProvider, portalConfig, SessionExpiry)
 	if err != nil {