diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 577cd59bc01..34aae156b19 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-=master
+1.31.0
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 32c1ab34777..a2f28f43be3 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-=24704-git-archive-by-path
+8.4.0