diff --git a/app/src/main/java/org/jboss/hal/client/configuration/subsystem/datasource/DataSourceTemplates.java b/app/src/main/java/org/jboss/hal/client/configuration/subsystem/datasource/DataSourceTemplates.java
index 8534ababc7..37cdf64aa7 100644
--- a/app/src/main/java/org/jboss/hal/client/configuration/subsystem/datasource/DataSourceTemplates.java
+++ b/app/src/main/java/org/jboss/hal/client/configuration/subsystem/datasource/DataSourceTemplates.java
@@ -136,7 +136,7 @@ public DataSourceTemplates() {
         Supplier<JdbcDriver> mySqlDriver = () -> {
             JdbcDriver driver = new JdbcDriver(MYSQL);
             driver.get(DRIVER_MODULE_NAME).set("com.mysql");
-            driver.get(DRIVER_CLASS_NAME).set("com.mysql.jdbc.Driver");
+            driver.get(DRIVER_CLASS_NAME).set("com.mysql.cj.jdbc.Driver");
             driver.get(DRIVER_XA_DATASOURCE_CLASS_NAME).set("com.mysql.jdbc.jdbc2.optional.MysqlXADataSource");
             return driver;
         };