diff --git a/docker/centos7/Makefile b/docker/centos7/Makefile
index 9a371f0..f9babda 100644
--- a/docker/centos7/Makefile
+++ b/docker/centos7/Makefile
@@ -1,7 +1,7 @@
 # Customise the following variable as Make parameters
 # to produce a yum.repo for a VENDOR distribution
 # Default values are pointing to GerritForge (www.gerritforge.com)
-VERSION=2.16.17
+VERSION=2.16.18
 RELEASE=1
 REPO_VERSION=1
 REPO_RELEASE=1
diff --git a/docker/ubuntu16.04/Makefile b/docker/ubuntu16.04/Makefile
index 5a6a83c..5777596 100644
--- a/docker/ubuntu16.04/Makefile
+++ b/docker/ubuntu16.04/Makefile
@@ -1,7 +1,7 @@
 # Customise the following variable as Make parameters
 # to produce a yum.repo for a VENDOR distribution
 # Default values are pointing to GerritForge (www.gerritforge.com)
-VERSION=2.16.17
+VERSION=2.16.18
 RELEASE=1
 VENDOR=GerritForge
 VENDOR_LC=$(shell echo $(VENDOR) | tr A-Z a-z)
diff --git a/fpm/Makefile b/fpm/Makefile
index 3ec8579..fdba90a 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,5 +1,5 @@
-VERSION=2.16.17
-WAR_VERSION=2.16.17
+VERSION=2.16.18
+WAR_VERSION=2.16.18
 URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
 CI_URL=https://gerrit-ci.gerritforge.com
 RELEASE=1
diff --git a/macOS/Makefile b/macOS/Makefile
index f0085bf..351cc33 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 2.16.17
+VERSION := 2.16.18
 
 all: server