diff --git a/build.gradle b/build.gradle
index e77d461..e5e240c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "eu.xenit.docker" version "5.2.0" apply false // Have a look at the releases to find the latest one
+    id "eu.xenit.docker" version "5.3.0" apply false // Have a look at the releases to find the latest one
 }
 
 project(':9.5') {
@@ -11,36 +11,36 @@ project(':9.5') {
 
 project(':9.6') {
     project.ext {
-        baseImage = 'postgres:9.6.21'
-        tags = ['9', '9.6', '9.6.21']
+        baseImage = 'postgres:9.6.22'
+        tags = ['9', '9.6', '9.6.22']
     }
 }
 
 project(':10') {
     project.ext {
-        baseImage = 'postgres:10.16'
-        tags = ['10', '10.16']
+        baseImage = 'postgres:10.17'
+        tags = ['10', '10.17']
     }
 }
 
 project(':11') {
     project.ext {
-        baseImage = 'postgres:11.11'
-        tags = ['11', '11.11']
+        baseImage = 'postgres:11.12'
+        tags = ['11', '11.12']
     }
 }
 
 project(':12') {
     project.ext {
-        baseImage = 'postgres:12.6'
-        tags = ['12', '12.6']
+        baseImage = 'postgres:12.7'
+        tags = ['12', '12.7']
     }
 }
 
 project(':13') {
     project.ext {
-        baseImage = 'postgres:13.2'
-        tags = ['13', '13.2', 'latest']
+        baseImage = 'postgres:13.3'
+        tags = ['13', '13.3', 'latest']
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d913..69a9715 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.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index ac10da1..a0ed516 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,8 +1,6 @@
 ARG BASEIMAGE
 
-
 FROM $BASEIMAGE
-MAINTAINER thijs.lemmens@xenit.eu
 
 ARG PGVERSION
 ARG WALGVERSION