diff --git a/defaults/main.yml b/defaults/main.yml
index 368cbe2..6b92d2d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -12,6 +12,7 @@ keycloak_java_min_heap: '2048m'
 keycloak_java_max_heap: '{{ keycloak_java_min_heap }}'
 
 keycloak_use_external_db: True
+# postgresql is the only supported choice for the time being
 keycloak_db: 'postgresql'
 keycloak_db_module_name: 'org.{{ keycloak_db }}'
 keycloak_db_module_path: 'org/{{ keycloak_db }}'
@@ -24,6 +25,7 @@ keycloak_database_user: keycloak_u
 #keycloak_database_password: 'define it into a vault file'
 keycloak_database_host: 'localhost'
 keycloak_database_max_pool_size: '50'
+keycloak_database_jboss_connection_checker: True
 
 keycloak_admin_user: kadmin
 #keycloak_admin_password: 'define it into a vault file'
diff --git a/templates/standalone-ha.xml.j2 b/templates/standalone-ha.xml.j2
index 8e1b425..17279a6 100644
--- a/templates/standalone-ha.xml.j2
+++ b/templates/standalone-ha.xml.j2
@@ -139,7 +139,17 @@
                     <pool>
                         <max-pool-size>{{ keycloak_database_max_pool_size }}</max-pool-size>
                     </pool>
-
+                    <validation>
+                    {% if keycloak_database_jboss_connection_checker %}
+                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"></valid-connection-checker>
+                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter"></exception-sorter>
+                    {% else %}
+                        <check-valid-connection-sql>select 1</check-valid-connection-sql>
+                        <validate-on-match>false</validate-on-match>
+                        <background-validation>true</background-validation>
+                        <background-validation-millis>10000</background-validation-millis>
+                    {% endif %}
+                    </validation>
                     <security>
                         <user-name>{{ keycloak_database_user }}</user-name>
                         <password>{{ keycloak_database_password }}</password>
diff --git a/templates/standalone.xml.j2 b/templates/standalone.xml.j2
index 59ac4e9..798e1ca 100644
--- a/templates/standalone.xml.j2
+++ b/templates/standalone.xml.j2
@@ -137,7 +137,17 @@
                     <pool>
                         <max-pool-size>{{ keycloak_database_max_pool_size }}</max-pool-size>
                     </pool>
-
+                    <validation>
+                    {% if keycloak_database_jboss_connection_checker %}
+                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"></valid-connection-checker>
+                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter"></exception-sorter>
+                    {% else %}
+                        <check-valid-connection-sql>select 1</check-valid-connection-sql>
+                        <validate-on-match>false</validate-on-match>
+                        <background-validation>true</background-validation>
+                        <background-validation-millis>10000</background-validation-millis>
+                    {% endif %}
+                    </validation>
                     <security>
                         <user-name>{{ keycloak_database_user }}</user-name>
                         <password>{{ keycloak_database_password }}</password>