diff --git a/fhir-server/liberty-config/configDropins/defaults/datasource.xml b/fhir-server/liberty-config/configDropins/defaults/datasource.xml
index 8b2cf204ceb..98730d1124d 100644
--- a/fhir-server/liberty-config/configDropins/defaults/datasource.xml
+++ b/fhir-server/liberty-config/configDropins/defaults/datasource.xml
@@ -7,7 +7,7 @@
     <!-- ============================================================== -->
     <!-- TENANT: default; DSID: default; TYPE: read-write               -->
     <!-- ============================================================== -->
-    <dataSource id="bootstrapDefaultDefault" jndiName="jdbc/bootstrap_default_default" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true">
+    <dataSource id="bootstrapDefaultDefault" jndiName="jdbc/bootstrap_default_default" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true" validationTimeout="30s">
         <jdbcDriver javax.sql.XADataSource="org.apache.derby.jdbc.EmbeddedXADataSource" libraryRef="sharedLibDerby"/>
         <properties.derby.embedded createDatabase="create" databaseName="derby/fhirDB"/>
         <connectionManager maxPoolSize="50" minPoolSize="10"/>
diff --git a/fhir-server/liberty-config/configDropins/disabled/datasource-db2.xml b/fhir-server/liberty-config/configDropins/disabled/datasource-db2.xml
index 5199008525a..ad9ae34e7f9 100644
--- a/fhir-server/liberty-config/configDropins/disabled/datasource-db2.xml
+++ b/fhir-server/liberty-config/configDropins/disabled/datasource-db2.xml
@@ -2,7 +2,7 @@
     <!-- ============================================================== -->
     <!-- TENANT: default; DSID: default; TYPE: read-write               -->
     <!-- ============================================================== -->
-    <dataSource id="fhirDefaultDefault" jndiName="jdbc/fhir_default_default" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true">
+    <dataSource id="fhirDefaultDefault" jndiName="jdbc/fhir_default_default" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true" validationTimeout="30s">
         <jdbcDriver javax.sql.XADataSource="com.ibm.db2.jcc.DB2XADataSource" libraryRef="sharedLibDb2"/>
         <properties.db2.jcc
              serverName="db2"
diff --git a/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml b/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml
index 50cd0c71f7d..895f6a649ff 100644
--- a/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml
+++ b/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml
@@ -2,7 +2,7 @@
     <!-- ============================================================== -->
     <!-- TENANT: tenant1; DSID: profile; TYPE: read-write               -->
     <!-- ============================================================== -->
-    <dataSource id="fhirTenant1Profile" jndiName="jdbc/fhir_tenant1_profile" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true">
+    <dataSource id="fhirTenant1Profile" jndiName="jdbc/fhir_tenant1_profile" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true" validationTimeout="30s">
         <jdbcDriver javax.sql.XADataSource="org.apache.derby.jdbc.EmbeddedXADataSource" libraryRef="sharedLibDerby"/>
         <properties.derby.embedded createDatabase="create" databaseName="derby/profile"/>
         <connectionManager maxPoolSize="50" minPoolSize="10"/>
@@ -11,7 +11,7 @@
     <!-- ============================================================== -->
     <!-- TENANT: tenant1; DSID: reference; TYPE: read-write             -->
     <!-- ============================================================== -->
-    <dataSource id="fhirTenant1Reference" jndiName="jdbc/fhir_tenant1_reference" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true">
+    <dataSource id="fhirTenant1Reference" jndiName="jdbc/fhir_tenant1_reference" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true" validationTimeout="30s">
         <jdbcDriver javax.sql.XADataSource="org.apache.derby.jdbc.EmbeddedXADataSource" libraryRef="sharedLibDerby"/>
         <properties.derby.embedded createDatabase="create" databaseName="derby/reference"/>
         <connectionManager maxPoolSize="50" minPoolSize="10"/>
@@ -20,7 +20,7 @@
     <!-- ============================================================== -->
     <!-- TENANT: tenant1; DSID: study1; TYPE: read-write                -->
     <!-- ============================================================== -->
-    <dataSource id="fhirTenant1Study1" jndiName="jdbc/fhir_tenant1_study1" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true">
+    <dataSource id="fhirTenant1Study1" jndiName="jdbc/fhir_tenant1_study1" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true" validationTimeout="30s">
         <jdbcDriver javax.sql.XADataSource="org.apache.derby.jdbc.EmbeddedXADataSource" libraryRef="sharedLibDerby"/>
         <properties.derby.embedded createDatabase="create" databaseName="derby/study1"/>
         <connectionManager maxPoolSize="50" minPoolSize="10"/>
diff --git a/fhir-server/liberty-config/configDropins/disabled/datasource-postgresql.xml b/fhir-server/liberty-config/configDropins/disabled/datasource-postgresql.xml
index 54ea55690bd..55e4e0c1aed 100644
--- a/fhir-server/liberty-config/configDropins/disabled/datasource-postgresql.xml
+++ b/fhir-server/liberty-config/configDropins/disabled/datasource-postgresql.xml
@@ -2,7 +2,7 @@
     <!-- ============================================================== -->
     <!-- TENANT: default; DSID: default; TYPE: read-write               -->
     <!-- ============================================================== -->
-    <dataSource id="fhirDefaultDefault" jndiName="jdbc/fhir_default_default" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true">
+    <dataSource id="fhirDefaultDefault" jndiName="jdbc/fhir_default_default" type="javax.sql.XADataSource" statementCacheSize="200" syncQueryTimeoutWithTransactionTimeout="true" validationTimeout="30s">
         <jdbcDriver javax.sql.XADataSource="org.postgresql.xa.PGXADataSource" libraryRef="sharedLibPostgres"/>
         <properties.postgresql
              serverName="postgres_postgres_1"