diff --git a/almalinux/8/Dockerfile b/almalinux/8/Dockerfile
index cfa1eeb..376ba35 100644
--- a/almalinux/8/Dockerfile
+++ b/almalinux/8/Dockerfile
@@ -2,7 +2,7 @@
 MAINTAINER Gerrit Code Review Community
 
 # Add Gerrit packages repository
-RUN rpm -i https://gerritforge.com/gerritforge-repo-1-2.noarch.rpm
+RUN rpm -i https://gerritforge.com/gerritforge-repo-1-4.noarch.rpm
 
 ADD entrypoint.sh /
 
@@ -10,7 +10,7 @@
 # (pre-trans Gerrit script needs to have access to the Java command)
 RUN yum -y install initscripts && \
     yum -y install java-11-openjdk && \
-    yum -y install gerrit-3.6.3-1 && \
+    yum -y install gerrit-3.6.3-2 && \
     /entrypoint.sh init && \
     rm -f /var/gerrit/etc/{ssh,secure}* && rm -Rf /var/gerrit/{static,index,logs,data,index,cache,git,db,tmp}/* && chown -R gerrit:gerrit /var/gerrit && \
     yum -y clean all
diff --git a/almalinux/8/Dockerfile-dev b/almalinux/8/Dockerfile-dev
index 0b73848..33ccee3 100644
--- a/almalinux/8/Dockerfile-dev
+++ b/almalinux/8/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM almalinux:8.5
+FROM almalinux:8.6
 MAINTAINER Gerrit Code Review Community
 
 ARG GERRIT_WAR_URL="https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war"
diff --git a/ubuntu/20/Dockerfile b/ubuntu/20/Dockerfile
index dae0628..90f23f4 100644
--- a/ubuntu/20/Dockerfile
+++ b/ubuntu/20/Dockerfile
@@ -16,7 +16,7 @@
 # Install OpenJDK and Gerrit in two subsequent transactions
 # (pre-trans Gerrit script needs to have access to the Java command)
 RUN apt-get -y install openjdk-11-jdk
-RUN apt-get -y install gerrit=3.6.3-1 && \
+RUN apt-get -y install gerrit=3.6.3-2 && \
     apt-mark hold gerrit && \
     /entrypoint.sh init && \
     bash -c 'rm -f /var/gerrit/etc/{ssh,secure}* && rm -Rf /var/gerrit/{static,index,logs,data,index,cache,git,db,tmp}/*' && \