diff --git a/image/cli/masfvt/fvt-manage.yml b/image/cli/masfvt/fvt-manage.yml
index 3665854bf82..494d2b21e13 100644
--- a/image/cli/masfvt/fvt-manage.yml
+++ b/image/cli/masfvt/fvt-manage.yml
@@ -31,6 +31,7 @@
     ldap_bind_password: "{{ lookup('env', 'LDAP_BIND_PASSWORD') }}"
     ldap_user_map: "{{ lookup('env', 'LDAP_USER_MAP') }}"
     ldap_cert_alias: "{{ lookup('env', 'LDAP_CERT_ALIAS') }}"
+    jdbc_type: "{{ lookup('env', 'JDBC_TYPE') }}"
     ldap_crt: "{{ lookup('env', 'LDAP_CRT') }}"
   tasks:
     - name: "Debug"
diff --git a/image/cli/masfvt/templates/mas-fvt-manage.yml.j2 b/image/cli/masfvt/templates/mas-fvt-manage.yml.j2
index 4c8c69e6a0d..2c765ed5073 100644
--- a/image/cli/masfvt/templates/mas-fvt-manage.yml.j2
+++ b/image/cli/masfvt/templates/mas-fvt-manage.yml.j2
@@ -43,6 +43,8 @@ spec:
       value: "{{ fvt_digest_manage_cypress }}"
     - name: ivt_digest_core
       value: "{{ ivt_digest_core }}"
+    - name: jdbc_type
+      value: "{{ jdbc_type }}"
 
   workspaces:
     # The generated configuration files
diff --git a/tekton/src/pipelines/gitops/gitops-mas-fvt-preparer-pipeline.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-fvt-preparer-pipeline.yml.j2
index 1936553b3bb..3391a9a5952 100644
--- a/tekton/src/pipelines/gitops/gitops-mas-fvt-preparer-pipeline.yml.j2
+++ b/tekton/src/pipelines/gitops/gitops-mas-fvt-preparer-pipeline.yml.j2
@@ -178,6 +178,9 @@ spec:
     - name: standalone_sls_service
       type: string
       default: ""
+    - name: jdbc_type
+      type: string
+      default: ""
 
   tasks:
     - name: mas-launchfvt
@@ -311,6 +314,8 @@ spec:
           value: $(params.ldap_basedn)
         - name: ldap_userid_map
           value: $(params.ldap_userid_map)
+        - name: jdbc_type
+          value: $(params.jdbc_type)
 
         - name: icn
           value: $(params.sls_license_icn)
diff --git a/tekton/src/pipelines/mas-fvt-manage.yml.j2 b/tekton/src/pipelines/mas-fvt-manage.yml.j2
index d44c705756b..8d557dfb9c6 100644
--- a/tekton/src/pipelines/mas-fvt-manage.yml.j2
+++ b/tekton/src/pipelines/mas-fvt-manage.yml.j2
@@ -62,6 +62,9 @@ spec:
     - name: ivt_digest_core
       type: string
       default: ""
+    - name: jdbc_type
+      type: string
+      default: ""
 
   tasks:
     - name: pipeline-start
@@ -122,6 +125,8 @@ spec:
           value: ibm-mas-manage
         - name: product_channel
           value: $(params.mas_app_channel_manage)
+        - name: jdbc_type
+          value: $(params.jdbc_type)
         - name: fvt_test_suite
           value: coreivt
         - name: workspace_id
diff --git a/tekton/src/tasks/fvt-launcher/mas-launchfvt-manage.yml.j2 b/tekton/src/tasks/fvt-launcher/mas-launchfvt-manage.yml.j2
index 6fffea4e472..8ad0fc356e6 100644
--- a/tekton/src/tasks/fvt-launcher/mas-launchfvt-manage.yml.j2
+++ b/tekton/src/tasks/fvt-launcher/mas-launchfvt-manage.yml.j2
@@ -165,6 +165,12 @@ spec:
             secretKeyRef:
               name: mas-fvt-manage
               key: LDAP_CRT
+              optional: false              
+        - name: JDBC_TYPE
+          valueFrom:
+            secretKeyRef:
+              name: mas-fvt-manage
+              key: JDBC_TYPE
               optional: false
 
     - name: wait-for-pipelinerun
diff --git a/tekton/src/tasks/gitops/gitops-mas-fvt-preparer.yml.j2 b/tekton/src/tasks/gitops/gitops-mas-fvt-preparer.yml.j2
index ead29fdf80b..d8d2a4ae805 100644
--- a/tekton/src/tasks/gitops/gitops-mas-fvt-preparer.yml.j2
+++ b/tekton/src/tasks/gitops/gitops-mas-fvt-preparer.yml.j2
@@ -174,6 +174,9 @@ spec:
     - name: ldap_userid_map
       type: string
       default: ""
+    - name: jdbc_type
+      type: string
+      default: ""
 
     - name: icn
       type: string
@@ -322,6 +325,8 @@ spec:
         value: $(params.ldap_userid_map)
       - name: LDAP_CERT_ALIAS
         value: ldap
+      - name: JDBC_TYPE
+        value: $(params.jdbc_type)
 
       - name: ICN
         value: $(params.icn)
diff --git a/tekton/src/tasks/ivt/ivt-core.yml.j2 b/tekton/src/tasks/ivt/ivt-core.yml.j2
index 314097df7b2..49605c743a2 100644
--- a/tekton/src/tasks/ivt/ivt-core.yml.j2
+++ b/tekton/src/tasks/ivt/ivt-core.yml.j2
@@ -47,6 +47,10 @@ spec:
     - name: mas_workspace_id
       type: string
       description: Workspace ID in MAS to use for running the tests
+    - name: jdbc_type
+      type: string
+      description: JDBC type for database connection
+      default: ""
 
   stepTemplate:
     name: 'ivt-core'
@@ -58,6 +62,8 @@ spec:
         value: $(params.product_channel)
       - name: NAMESPACE
         value: "mas-$(params.mas_instance_id)-core"
+      - name: JDBC_TYPE
+        value: $(params.jdbc_type)
       - name: INSTANCE_ID
         value: "$(params.mas_instance_id)"
       - name: WORKSPACE_ID