diff --git a/docker/gpcc-mocks/Dockerfile b/docker/gpcc-mocks/Dockerfile
index 03ec6bde..f94a21b4 100644
--- a/docker/gpcc-mocks/Dockerfile
+++ b/docker/gpcc-mocks/Dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:jdk11 AS build
+FROM gradle:6.9.4-jdk11 AS build
 
 COPY --chown=gradle:gradle gpcc-mocks /home/gradle/gpcc-mocks
 
diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile
index e362c382..da31f60a 100644
--- a/docker/service/Dockerfile
+++ b/docker/service/Dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:jdk11-hotspot AS build
+FROM gradle:6.9.4-jdk11 AS build
 
 COPY --chown=gradle:gradle service /home/gradle/service
 
diff --git a/gpcc-mocks/gradle/wrapper/gradle-wrapper.properties b/gpcc-mocks/gradle/wrapper/gradle-wrapper.properties
index 549d8442..53b9e380 100644
--- a/gpcc-mocks/gradle/wrapper/gradle-wrapper.properties
+++ b/gpcc-mocks/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/service/gradle/wrapper/gradle-wrapper.properties b/service/gradle/wrapper/gradle-wrapper.properties
index 2a563242..53b9e380 100644
--- a/service/gradle/wrapper/gradle-wrapper.properties
+++ b/service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/service/src/main/java/uk/nhs/adaptors/gpc/consumer/web/RequestBuilderService.java b/service/src/main/java/uk/nhs/adaptors/gpc/consumer/web/RequestBuilderService.java
index cdf6e6a5..0281ef6e 100644
--- a/service/src/main/java/uk/nhs/adaptors/gpc/consumer/web/RequestBuilderService.java
+++ b/service/src/main/java/uk/nhs/adaptors/gpc/consumer/web/RequestBuilderService.java
@@ -33,5 +33,4 @@ public ExchangeStrategies buildExchangeStrategies() {
                 configurer -> configurer.defaultCodecs()
                     .maxInMemorySize(BYTE_COUNT)).build();
     }
-    
 }