diff --git a/pattern-1/bosh-release/config/blobs.yml b/pattern-1/bosh-release/config/blobs.yml
index e69de29..91ebd38 100644
--- a/pattern-1/bosh-release/config/blobs.yml
+++ b/pattern-1/bosh-release/config/blobs.yml
@@ -0,0 +1,16 @@
+jdbcdrivers/mssql-jdbc-7.0.0.jre8.jar:
+  size: 1166240
+  object_id: 9905b92d-cb2c-4af8-679f-fcef851b166d
+  sha: 7668e824248b69849d3eff2a7beada01f177a232
+jdbcdrivers/mysql-connector-java-5.1.45-bin.jar:
+  size: 999810
+  object_id: 01282606-f1fc-47c6-6a35-ae79b7a91db0
+  sha: 6223be933fbc8d81f819aacad0ce09346d5911c4
+openjdk/OpenJDK8U-jdk_x64_linux_hotspot_8u192b12.tar.gz:
+  size: 78343064
+  object_id: d03f78a4-88a6-4042-7762-67fcca075906
+  sha: cb98715582bd68170cf00f9c2801e7162c73c8f8
+wso2is/wso2is-5.7.0.zip:
+  size: 446570330
+  object_id: 672cccda-b81d-4ea7-4928-d1f51c87f93a
+  sha: 9f74c105189a938840552e12c1d6e8d936f8fe42
diff --git a/pattern-1/tile/tile.yml b/pattern-1/tile/tile.yml
index 2e34606..92399e6 100644
--- a/pattern-1/tile/tile.yml
+++ b/pattern-1/tile/tile.yml
@@ -52,13 +52,9 @@ forms:
   - name: bps_db_query
     type: string
     label: Validation Query
-  - name: bps_db_username
-    type: string
-    label: Username
-  - name: bps_db_password
-    type: secret
-    label: Password
-    forms:
+  - name: bps_db_credentials
+    label: BPS Datasource Credentials
+    type: simple_credentials
 - name: user_db
   label: Registry and User Management Datasource connection information
   description: WSO2 Identity Server - Registry and User Management Datasource connection information
@@ -78,12 +74,9 @@ forms:
   - name: user_db_query
     type: string
     label: Validation Query
-  - name: user_db_username
-    type: string
-    label: Username
-  - name: user_db_password
-    type: secret
-    label: Password
+  - name: user_db_credentials
+    label: User DB Credentials
+    type: simple_credentials
 - name: conf_reg_db
   label: Configuration Registry Datasource connection information
   description: WSO2 Identity Server - Configuration Registry Datasource connection information
@@ -103,12 +96,9 @@ forms:
   - name: conf_reg_db_query
     type: string
     label: Validation Query
-  - name: conf_reg_db_username
-    type: string
-    label: Username
-  - name: conf_reg_db_password
-    type: secret
-    label: Password
+  - name: conf_reg_db_credentials
+    label: Configuration Registry DB Credentials
+    type: simple_credential
 - name: identity_db
   label: Identity Datasource connection information
   description: WSO2 Identity Server - Identity Datasource connection information
@@ -128,12 +118,9 @@ forms:
   - name: identity_db_query
     type: string
     label: Validation Query
-  - name: identity_db_username
-    type: string
-    label: Username
-  - name: identity_db_password
-    type: secret
-    label: Password
+  - name: identity_db_credentials
+    label: Identity DB Credentials
+    type: simple_credential
 
 packages:
 - name: routing_release
@@ -187,26 +174,26 @@ packages:
           jdbc_url: (( .properties.bps_db_jdbc_url.value ))
           driver: (( .properties.bps_db_driver.value ))
           query: (( .properties.bps_db_query.value ))
-          username: (( .properties.bps_db_username.value ))
-          password: (( .properties.bps_db_password.value ))
+          username: (( .properties.bps_db_credentials.identity ))
+          password: (( .properties.bps_db_credentials.password ))
         user_db:
           jdbc_url: (( .properties.user_db_jdbc_url.value ))
           driver: (( .properties.user_db_driver.value ))
           query: (( .properties.user_db_query.value ))
-          username: (( .properties.user_db_username.value ))
-          password: (( .properties.user_db_password.value ))
+          username: (( .properties.user_db_credentials.identity ))
+          password: (( .properties.user_db_credentials.password ))
         conf_reg_db:
           jdbc_url: (( .properties.conf_reg_db_jdbc_url.value ))
           driver: (( .properties.conf_reg_db_driver.value ))
           query: (( .properties.conf_reg_db_query.value ))
-          username: (( .properties.conf_reg_db_username.value ))
-          password: (( .properties.conf_reg_db_password.value ))
+          username: (( .properties.conf_reg_db_credentials.identity ))
+          password: (( .properties.conf_reg_db_credentials.password ))
         identity_db:
           jdbc_url: (( .properties.identity_db_jdbc_url.value ))
           driver: (( .properties.identity_db_driver.value ))
           query: (( .properties.identity_db_query.value ))
-          username: (( .properties.identity_db_username.value ))
-          password: (( .properties.identity_db_password.value ))
+          username: (( .properties.identity_db_credentials.identity ))
+          password: (( .properties.identity_db_credentials.password ))
       route_registrar:
         routes:
         - name: wso2is
diff --git a/pattern-2/bosh-release/config/blobs.yml b/pattern-2/bosh-release/config/blobs.yml
index e69de29..f36b5d6 100644
--- a/pattern-2/bosh-release/config/blobs.yml
+++ b/pattern-2/bosh-release/config/blobs.yml
@@ -0,0 +1,20 @@
+jdbcdrivers/mssql-jdbc-7.0.0.jre8.jar:
+  size: 1166240
+  object_id: c2adb78e-160f-4c48-5590-75906120a551
+  sha: 7668e824248b69849d3eff2a7beada01f177a232
+jdbcdrivers/mysql-connector-java-5.1.45-bin.jar:
+  size: 999810
+  object_id: d8d3e548-bbc0-493d-46a9-574ad93c4c80
+  sha: 6223be933fbc8d81f819aacad0ce09346d5911c4
+openjdk/OpenJDK8U-jdk_x64_linux_hotspot_8u192b12.tar.gz:
+  size: 78343064
+  object_id: 503e4e5b-d7f1-423d-5aaf-f4a768aa8ffd
+  sha: cb98715582bd68170cf00f9c2801e7162c73c8f8
+wso2is/wso2is-5.7.0.zip:
+  size: 446570330
+  object_id: 6bb4c499-adb6-4f4b-5304-0d4a81991984
+  sha: 9f74c105189a938840552e12c1d6e8d936f8fe42
+wso2is_analytics/wso2is-analytics-5.7.0.zip:
+  size: 191810936
+  object_id: da1ba757-56b5-4c89-6ba2-5a0a75b47d1a
+  sha: 31890137be8243233bf0cd97a84084ef2123fd1d
diff --git a/pattern-2/tile/tile.yml b/pattern-2/tile/tile.yml
index 5589cf4..809e31d 100644
--- a/pattern-2/tile/tile.yml
+++ b/pattern-2/tile/tile.yml
@@ -52,13 +52,9 @@ forms:
   - name: bps_db_query
     type: string
     label: Validation Query
-  - name: bps_db_username
-    type: string
-    label: Username
-  - name: bps_db_password
-    type: secret
-    label: Password
-    forms:
+  - name: bps_db_credentials
+    label: BPS Datasource Credentials
+    type: simple_credentials
 - name: user_db
   label: Registry and User Management Datasource connection information
   description: WSO2 Identity Server - Registry and User Management Datasource connection information
@@ -78,12 +74,9 @@ forms:
   - name: user_db_query
     type: string
     label: Validation Query
-  - name: user_db_username
-    type: string
-    label: Username
-  - name: user_db_password
-    type: secret
-    label: Password
+  - name: user_db_credentials
+    label: User DB Credentials
+    type: simple_credentials
 - name: conf_reg_db
   label: Configuration Registry Datasource connection information
   description: WSO2 Identity Server - Configuration Registry Datasource connection information
@@ -103,12 +96,9 @@ forms:
   - name: conf_reg_db_query
     type: string
     label: Validation Query
-  - name: conf_reg_db_username
-    type: string
-    label: Username
-  - name: conf_reg_db_password
-    type: secret
-    label: Password
+  - name: conf_reg_db_credentials
+    label: Config Resgistry DB Credentials
+    type: simple_credentials
 - name: identity_db
   label: Identity Datasource connection information
   description: WSO2 Identity Server - Identity Datasource connection information
@@ -128,12 +118,9 @@ forms:
   - name: identity_db_query
     type: string
     label: Validation Query
-  - name: identity_db_username
-    type: string
-    label: Username
-  - name: identity_db_password
-    type: secret
-    label: Password
+  - name: identity_db_credentials
+    label: Identity DB Credentials
+    type: simple_credentials
 - name: analytics_db
   label: Identity Server Analytics Datasource connection information
   description: WSO2 Identity Server - Identity Server Analytics Datasource connection information
@@ -153,12 +140,9 @@ forms:
   - name: analytics_db_query
     type: string
     label: Validation Query
-  - name: analytics_db_username
-    type: string
-    label: Username
-  - name: analytics_db_password
-    type: secret
-    label: Password
+  - name: analytics_db_credentials
+    label: Analytics DB Credentials
+    type: simple_credentials
 
 packages:
 - name: routing_release
@@ -199,8 +183,8 @@ packages:
           jdbc_url: (( .properties.analytics_db_jdbc_url.value ))
           driver: (( .properties.analytics_db_driver.value ))
           query: (( .properties.analytics_db_query.value ))
-          username: (( .properties.analytics_db_username.value ))
-          password: (( .properties.analytics_db_password.value ))
+          username: (( .properties.analytics_db_credentials.identity ))
+          password: (( .properties.analytics_db_credentials.password ))
 
   - name: wso2is_analytics_dashboard
     instances: 1
@@ -240,8 +224,8 @@ packages:
           jdbc_url: (( .properties.analytics_db_jdbc_url.value ))
           driver: (( .properties.analytics_db_driver.value ))
           query: (( .properties.analytics_db_query.value ))
-          username: (( .properties.analytics_db_username.value ))
-          password: (( .properties.analytics_db_password.value ))
+          username: (( .properties.analytics_db_credentials.identity ))
+          password: (( .properties.analytics_db_credentials.password ))
       route_registrar:
         routes:
         - name: wso2is_analytics_dashboard
@@ -288,26 +272,26 @@ packages:
           jdbc_url: (( .properties.bps_db_jdbc_url.value ))
           driver: (( .properties.bps_db_driver.value ))
           query: (( .properties.bps_db_query.value ))
-          username: (( .properties.bps_db_username.value ))
-          password: (( .properties.bps_db_password.value ))
+          username: (( .properties.bps_db_credentials.identity ))
+          password: (( .properties.bps_db_credentials.password ))
         user_db:
           jdbc_url: (( .properties.user_db_jdbc_url.value ))
           driver: (( .properties.user_db_driver.value ))
           query: (( .properties.user_db_query.value ))
-          username: (( .properties.user_db_username.value ))
-          password: (( .properties.user_db_password.value ))
+          username: (( .properties.user_db_credentials.identity ))
+          password: (( .properties.user_db_credentials.password ))
         conf_reg_db:
           jdbc_url: (( .properties.conf_reg_db_jdbc_url.value ))
           driver: (( .properties.conf_reg_db_driver.value ))
           query: (( .properties.conf_reg_db_query.value ))
-          username: (( .properties.conf_reg_db_username.value ))
-          password: (( .properties.conf_reg_db_password.value ))
+          username: (( .properties.conf_reg_db_credentials.identity ))
+          password: (( .properties.conf_reg_db_credentials.password ))
         identity_db:
           jdbc_url: (( .properties.identity_db_jdbc_url.value ))
           driver: (( .properties.identity_db_driver.value ))
           query: (( .properties.identity_db_query.value ))
-          username: (( .properties.identity_db_username.value ))
-          password: (( .properties.identity_db_password.value ))
+          username: (( .properties.identity_db_credentials.identity ))
+          password: (( .properties.identity_db_credentials.password ))
       route_registrar:
         routes:
         - name: wso2is