diff --git a/build.gradle b/build.gradle
index 062cee1b..8450388e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ dependencies {
     compile("org.javers:javers-core:2.4.1")
     compile("javax.xml.bind:jaxb-api:2.3.1")
     compile("com.amazonaws:aws-java-sdk-s3:1.12.187")
-    runtime("mysql:mysql-connector-java:5.1.47")
+    runtime("mysql:mysql-connector-java:8.0.33")
     runtime("javax.annotation:javax.annotation-api:1.3.2")
     testCompile("junit:junit")
     testCompile("com.h2database:h2:1.4.199")
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 73753715..7c5ede50 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,7 +2,7 @@
 spring.datasource.url=${IPA_DATASOURCE_URL}
 spring.datasource.username=${IPA_DATASOURCE_USERNAME}
 spring.datasource.password=${IPA_DATASOURCE_PASSWORD}
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.hikari.maximum-pool-size=20
 spring.datasource.hikari.minimum-idle=${IPA_DATASOURCE_POOL_MIN}
 spring.datasource.hikari.connection-test-query=SELECT 1
diff --git a/src/main/resources/application.properties.example b/src/main/resources/application.properties.example
index 3ea9f6bb..cfac5e89 100644
--- a/src/main/resources/application.properties.example
+++ b/src/main/resources/application.properties.example
@@ -1,7 +1,7 @@
 spring.datasource.url=jdbc:mysql://localhost:3306/IPA
 spring.datasource.username=root
 spring.datasource.password=
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 # Avoid Spring Boot's opinions on column naming (ignores @Column(name="") for lovely_camel_case_names)
 spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.DefaultNamingStrategy