diff --git a/manifests/init.pp b/manifests/init.pp
index 82d02f8..261d128 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -104,6 +104,15 @@ class zanata(
     require      => Package['unzip'],
   }
 
+  # The mysql driver name differs based on the version of the package. Ensure
+  # we set it correctly when writing the standalone.xml config file below.
+  if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') {
+    $mysql_driver_name = 'mysql-connector-java.jar_com.mysql.jdbc.Driver_5_1'
+  }
+  else {
+    $mysql_driver_name = 'mysql-connector-java.jar'
+  }
+
   file { '/opt/wildfly/standalone/deployments/mysql-connector-java.jar':
     ensure  => 'link',
     target  => '/usr/share/java/mysql-connector-java.jar',
diff --git a/templates/standalone.xml.erb b/templates/standalone.xml.erb
index 7d86fee..53993d0 100644
--- a/templates/standalone.xml.erb
+++ b/templates/standalone.xml.erb
@@ -155,7 +155,7 @@
                 <datasource jndi-name="java:jboss/datasources/zanataDatasource" pool-name="zanataDatasource" enabled="true" use-ccm="false">
                     <connection-url>jdbc:mysql://<%= @mysql_host %>:<%= @mysql_port %>/zanata?characterEncoding=UTF-8</connection-url>
                     <driver-class>com.mysql.jdbc.Driver</driver-class>
-                    <driver>mysql-connector-java.jar</driver>
+                    <driver><%= @mysql_driver_name %></driver>
                     <pool>
                         <min-pool-size>0</min-pool-size>
                         <max-pool-size>20</max-pool-size>