diff --git a/fpm/Makefile b/fpm/Makefile
index 79994c8..8d17c56 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,9 +1,9 @@
 VERSION=3.6.0
-WAR_VERSION=3.6.0-rc5
+WAR_VERSION=3.6.0
 BRANCH=stable-3.6
 URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
 CI_URL=https://gerrit-ci.gerritforge.com
-RELEASE=0rc5
+RELEASE=1
 
 NAME=gerrit
 CATEGORY=Development
@@ -26,7 +26,7 @@
   plugin-out-of-the-box-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
 PLUGINS_JOBS= \
   plugin-avatars-gravatar-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
-  plugin-uploadvalidator-bazel-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
+  plugin-uploadvalidator-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
 
 RPM_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
 DEB_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).deb
diff --git a/macOS/Makefile b/macOS/Makefile
index 4ec2ec6..e8d5a3b 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 3.6.0-rc5
+VERSION := 3.6.0
 
 all: server