diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
index 68ce6be8..de9e9b66 100644
--- a/src/main/environment/common_ci.properties
+++ b/src/main/environment/common_ci.properties
@@ -1,7 +1,7 @@
 spring.datasource.url=@env.DATABASE_URL@
 spring.datasource.username=@env.DATABASE_USERNAME@
 spring.datasource.password=@env.DATABASE_PASSWORD@
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 common-api-url-searchuserbyid=@env.COMMON_API@beneficiary/searchUserByID
 common-api-url-searchBeneficiary=@env.COMMON_API@beneficiary/searchBeneficiary
diff --git a/src/main/environment/common_docker.properties b/src/main/environment/common_docker.properties
index 094ba151..5ea4ec3c 100644
--- a/src/main/environment/common_docker.properties
+++ b/src/main/environment/common_docker.properties
@@ -1,7 +1,7 @@
 spring.datasource.url=${DATABASE_URL}
 spring.datasource.username=${DATABASE_USERNAME}
 spring.datasource.password=${DATABASE_PASSWORD}
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 common-api-url-searchuserbyid=${COMMON_API}beneficiary/searchUserByID
 common-api-url-searchBeneficiary=${COMMON_API}beneficiary/searchBeneficiary
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
index 4f325b42..5d23ef46 100644
--- a/src/main/environment/common_example.properties
+++ b/src/main/environment/common_example.properties
@@ -2,7 +2,7 @@ server.port=8086
 spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
 spring.datasource.username=root
 spring.datasource.password=1234
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 spring.profiles.active=test
 callcentre-server-ip=10.208.122.99