diff --git a/common.env b/common.env
index cf8dc61..61cb015 100644
--- a/common.env
+++ b/common.env
@@ -4,9 +4,8 @@
 CLUSTER_KEYS=$(AWS_PREFIX)-cluster-keys
 
 # Gerrit version
-GERRIT_VERSION=3.8
-GERRIT_PATCH=2
-GERRIT_BUILD_ARCH=almalinux9
+GERRIT_VERSION=3.6
+GERRIT_PATCH=3
 GERRIT_BRANCH=stable-$(GERRIT_VERSION)
 
 # Gerrit CI
diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile
index 2156ac8..a303aeb 100644
--- a/gerrit/Dockerfile
+++ b/gerrit/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:$GERRIT_VERSION.$GERRIT_PATCH-$GERRIT_BUILD_ARCH
+FROM gerritcodereview/gerrit:$GERRIT_VERSION.$GERRIT_PATCH-almalinux8
 
 ARG withXRay=false