diff --git a/build.gradle b/build.gradle
index b935997f..46f82d78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,6 @@ buildscript {
 }
 
 plugins {
-    id 'io.franzbecker.gradle-lombok' version '3.2.0' apply false
     id "biz.aQute.bnd.builder" version "5.1.2" apply false
     id "org.sonarqube" version "3.0"
     id "jacoco"
@@ -49,7 +48,6 @@ subprojects {
     apply plugin: 'java'
     apply plugin: 'maven-publish'
     apply plugin: 'signing'
-    apply plugin: 'io.franzbecker.gradle-lombok'
 
     repositories {
         mavenLocal()
@@ -58,6 +56,14 @@ subprojects {
         maven { url "https://repo.spring.io/libs-milestone" }
     }
 
+    dependencies {
+        compileOnly "org.projectlombok:lombok:$LIB_LOMBOK_VER"
+        annotationProcessor "org.projectlombok:lombok:$LIB_LOMBOK_VER"
+
+        testCompileOnly "org.projectlombok:lombok:$LIB_LOMBOK_VER"
+        testAnnotationProcessor "org.projectlombok:lombok:$LIB_LOMBOK_VER"
+    }
+
     idea {
         module {
             downloadJavadoc = true
@@ -72,11 +78,6 @@ subprojects {
 
     compileJava.dependsOn(processResources)
 
-    lombok {
-        version = "1.18.16"
-        sha256 = ""
-    }
-
     jacocoTestReport {
         reports {
             xml.enabled = true
@@ -86,7 +87,6 @@ subprojects {
     }
 
     if (!it.name.startsWith('example')) {
-
         jar {
             from "LICENSE.md"
         }
@@ -184,5 +184,5 @@ nexusStaging {
 }
 
 wrapper {
-    gradleVersion = "${GRADLE_WRAPPER_VER}"
+    distributionType = Wrapper.DistributionType.ALL
 }
diff --git a/gradle.properties b/gradle.properties
index acc5d664..3e24ed16 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,6 +10,7 @@ PROJECT_DEV_NAME=Andrew Potter
 LIB_GRAPHQL_JAVA_VER=16.1
 LIB_JACKSON_VER=2.12.0
 LIB_SLF4J_VER=1.7.30
+LIB_LOMBOK_VER=1.18.20
 SOURCE_COMPATIBILITY=1.8
 TARGET_COMPATIBILITY=1.8
-GRADLE_WRAPPER_VER=6.7.1
+GRADLE_WRAPPER_VER=7.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1f3fdbc5..3c4101c3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/graphql-java-kickstart/build.gradle b/graphql-java-kickstart/build.gradle
index 91980b72..068d379b 100644
--- a/graphql-java-kickstart/build.gradle
+++ b/graphql-java-kickstart/build.gradle
@@ -4,14 +4,16 @@ jar {
     bndfile = 'bnd.bnd'
 }
 
+apply plugin: 'java-library-distribution'
+
 dependencies {
     // GraphQL
-    compile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
+    api "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
     implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER"
 
     // JSON
-    compile "com.fasterxml.jackson.core:jackson-core:$LIB_JACKSON_VER"
-    compile "com.fasterxml.jackson.core:jackson-annotations:$LIB_JACKSON_VER"
-    compile "com.fasterxml.jackson.core:jackson-databind:$LIB_JACKSON_VER"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$LIB_JACKSON_VER"
+    api "com.fasterxml.jackson.core:jackson-core:$LIB_JACKSON_VER"
+    api "com.fasterxml.jackson.core:jackson-annotations:$LIB_JACKSON_VER"
+    api "com.fasterxml.jackson.core:jackson-databind:$LIB_JACKSON_VER"
+    api "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$LIB_JACKSON_VER"
 }
diff --git a/graphql-java-servlet/build.gradle b/graphql-java-servlet/build.gradle
index 4eb22872..c9a976f1 100644
--- a/graphql-java-servlet/build.gradle
+++ b/graphql-java-servlet/build.gradle
@@ -17,8 +17,8 @@ dependencies {
     api(project(':graphql-java-kickstart'))
 
     // Servlet
-    compile 'javax.servlet:javax.servlet-api:3.1.0'
-    compile 'javax.websocket:javax.websocket-api:1.1'
+    api 'javax.servlet:javax.servlet-api:3.1.0'
+    api 'javax.websocket:javax.websocket-api:1.1'
     implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER"
 
     // OSGi
@@ -29,15 +29,15 @@ dependencies {
     compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0'
     compileOnly 'org.osgi:org.osgi.annotation:6.0.0'
 
-    testCompile 'io.github.graphql-java:graphql-java-annotations:8.3'
+    testImplementation 'io.github.graphql-java:graphql-java-annotations:8.3'
 
     // Unit testing
-    testCompile "org.codehaus.groovy:groovy-all:2.4.1"
-    testCompile "org.spockframework:spock-core:1.1-groovy-2.4-rc-3"
-    testRuntime "cglib:cglib-nodep:3.2.4"
-    testRuntime "org.objenesis:objenesis:2.5.1"
-    testCompile "org.slf4j:slf4j-simple:$LIB_SLF4J_VER"
-    testCompile 'org.springframework:spring-test:4.3.7.RELEASE'
-    testRuntime 'org.springframework:spring-web:4.3.7.RELEASE'
-    testCompile 'com.google.guava:guava:24.1.1-jre'
+    testImplementation "org.codehaus.groovy:groovy-all:2.4.1"
+    testImplementation "org.spockframework:spock-core:1.1-groovy-2.4-rc-3"
+    testRuntimeOnly "cglib:cglib-nodep:3.2.4"
+    testRuntimeOnly "org.objenesis:objenesis:2.5.1"
+    testImplementation "org.slf4j:slf4j-simple:$LIB_SLF4J_VER"
+    testImplementation 'org.springframework:spring-test:4.3.7.RELEASE'
+    testRuntimeOnly 'org.springframework:spring-web:4.3.7.RELEASE'
+    testImplementation 'com.google.guava:guava:24.1.1-jre'
 }