diff --git a/fpm/Makefile b/fpm/Makefile
index 0baba48..dc08032 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,7 +1,8 @@
-VERSION=3.4.8
-WAR_VERSION=3.4.8
+VERSION=3.5.4
+WAR_VERSION=3.5.4
+BRANCH=stable-3.5
 URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
-CI_URL=https://archive-ci.gerritforge.com
+CI_URL=https://gerrit-ci.gerritforge.com
 RELEASE=2
 
 NAME=gerrit
@@ -20,12 +21,12 @@
 WEB_URL=https://www.gerritcodereview.com/
 
 WAR=$(BUILD_ROOT)/bin/gerrit.war
-PLUGINS_CI=https://archive-ci.gerritforge.com/job
+PLUGINS_CI=https://gerrit-ci.gerritforge.com/job
 LIBS_JOBS= \
-  plugin-out-of-the-box-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
+  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-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
-  plugin-uploadvalidator-bazel-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
+  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
 
 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 0450d73..d1ac419 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 3.4.8
+VERSION := 3.5.4
 
 all: server