diff --git a/build.gradle b/build.gradle
index fd5dd9a..580b71f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,6 @@ plugins {
     id "org.flywaydb.flyway" version "6.0.8"
     id "org.sonarqube" version "3.3"
     id "com.moowork.node" version "1.2.0"
-    id "io.freefair.lombok" version "5.1.1"
 }
 
 apply plugin: 'java'
@@ -51,6 +50,10 @@ dependencies {
     compile 'org.openlmis:openlmis-service-util:3.1.0'
     compile 'org.webjars.npm:api-console:3.0.17'
 
+    compile "org.projectlombok:lombok"
+    annotationProcessor "org.projectlombok:lombok:1.18.22"
+    testAnnotationProcessor "org.projectlombok:lombok:1.18.22"
+
     testCompile "junit:junit"
     testCompile "org.springframework.boot:spring-boot-starter-test"
     testCompile "org.springframework:spring-test"