diff --git a/templates/standalone-ha.xml.j2 b/templates/standalone-ha.xml.j2
index 00b4c5d..e57adb8 100644
--- a/templates/standalone-ha.xml.j2
+++ b/templates/standalone-ha.xml.j2
@@ -195,7 +195,11 @@
                     <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
                 </managed-scheduled-executor-services>
             </concurrent>
+            {% if keycloak_use_external_db %}
+            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/KeycloakDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+            {% else %}
             <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+            {% endif %}
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:ejb3:6.0">
             <session-bean>
diff --git a/templates/standalone.xml.j2 b/templates/standalone.xml.j2
index 973395b..34b08b4 100644
--- a/templates/standalone.xml.j2
+++ b/templates/standalone.xml.j2
@@ -193,7 +193,11 @@
                     <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
                 </managed-scheduled-executor-services>
             </concurrent>
+            {% if keycloak_use_external_db %}
+            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/KeycloakDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+            {% else %}
             <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+            {% endif %}
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:ejb3:6.0">
             <session-bean>