diff --git a/forks/hubzilla-docker/Dockerfile b/forks/hubzilla-docker/Dockerfile
index 5b27b26..591ff3f 100644
--- a/forks/hubzilla-docker/Dockerfile
+++ b/forks/hubzilla-docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.18
 MAINTAINER Silvio Fricke <silvio.fricke@gmail.com>
 
 ARG HUBZILLAVERSION=4.4.1
diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile
index 943aa5f..834e896 100644
--- a/gerrit/Dockerfile
+++ b/gerrit/Dockerfile
@@ -1,20 +1,15 @@
-FROM gerritcodereview/gerrit:3.4.1
+FROM gerritcodereview/gerrit:3.7.2
 
 USER root
 
-#ADD https://github.com/davido/gerrit-oauth-provider/releases/download/v3.0.0/gerrit-oauth-provider.jar /var/gerrit/plugins/gerrit-oauth-provider.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-oauth-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/oauth/oauth.jar /var/gerrit/plugins/gerrit-oauth-provider.jar
-#ADD https://gerrit-ci.gerritforge.com/job/plugin-gitblit-bazel-master/8/artifact/bazel-bin/plugins/gitblit/gitblit.jar  /var/gerrit/plugins/gitblit.jar
-ADD https://github.com/tomaswolf/gerrit-gitblit-plugin/releases/download/v3.2.171.0/gitblit-plugin-3.2.171.0.jar /var/gerrit/plugins/gitblit.jar
-#ADD https://gerrit-ci.gerritforge.com/job/plugin-its-phabricator-bazel-stable-2.15/14/artifact/bazel-genfiles/plugins/its-phabricator/its-phabricator.jar /var/gerrit/plugins/its-phabricator.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-serviceuser-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/serviceuser/serviceuser.jar /var/gerrit/plugins/serviceuser.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-lfs-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/lfs/lfs.jar /var/gerrit/plugins/lfs.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-ref-protection-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/ref-protection/ref-protection.jar /var/gerrit/plugins/ref-protection.jar
-#ADD https://gerrit-ci.gerritforge.com/job/plugin-x-docs-bazel-stable-2.15/8/artifact/bazel-genfiles/plugins/x-docs/x-docs.jar /var/gerrit/plugins/x-docs.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-rename-project-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/rename-project/rename-project.jar /var/gerrit/plugins/rename-project.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-admin-console-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/admin-console/admin-console.jar /var/gerrit/plugins/admin-console.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-github-mvn-stable-3.4/lastSuccessfulBuild/artifact/github-plugin/target/github-plugin-3.4.0-rc0.jar /var/gerrit/plugins/github.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-github-mvn-stable-3.4/lastSuccessfulBuild/artifact/github-oauth/target/github-oauth-3.4.0-rc0.jar /var/gerrit/lib/github-oauth.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-oauth-bazel-master-stable-3.7/lastSuccessfulBuild/artifact/bazel-bin/plugins/oauth/oauth.jar /var/gerrit/plugins/gerrit-oauth-provider.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-serviceuser-bazel-master-stable-3.7/lastSuccessfulBuild/artifact/bazel-bin/plugins/serviceuser/serviceuser.jar /var/gerrit/plugins/serviceuser.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-lfs-bazel-master-stable-3.7/lastSuccessfulBuild/artifact/bazel-bin/plugins/lfs/lfs.jar /var/gerrit/plugins/lfs.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-ref-protection-bazel-master-stable-3.7/lastSuccessfulBuild/artifact/bazel-bin/plugins/ref-protection/ref-protection.jar /var/gerrit/plugins/ref-protection.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-rename-project-bazel-master-stable-3.6/lastSuccessfulBuild/artifact/bazel-bin/plugins/rename-project/rename-project.jar /var/gerrit/plugins/rename-project.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-admin-console-bazel-master-stable-3.7/lastSuccessfulBuild/artifact/bazel-bin/plugins/admin-console/admin-console.jar /var/gerrit/plugins/admin-console.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-github-mvn-stable-3.7/lastSuccessfulBuild/artifact/github-plugin/target/github-plugin-3.7.0-rc3.jar /var/gerrit/plugins/github.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-github-mvn-stable-3.7/lastSuccessfulBuild/artifact/github-oauth/target/github-oauth-3.7.0-rc3.jar /var/gerrit/lib/github-oauth.jar
 
 RUN chown gerrit /var/gerrit/plugins/* /var/gerrit/lib/*
 
diff --git a/gerrit/gerrit-k8s.yaml b/gerrit/gerrit-k8s.yaml
index 92d5966..28341e9 100644
--- a/gerrit/gerrit-k8s.yaml
+++ b/gerrit/gerrit-k8s.yaml
@@ -111,7 +111,7 @@
             defaultMode: 0444
       #initContainers:
       #  - name: reindex
-      #    image: docker.benkard.de/mulk/gerrit:3.4.1-4
+      #    image: docker.benkard.de/mulk/gerrit:3.7.1-1
       #    command:
       #      - java
       #      - -jar
@@ -119,6 +119,8 @@
       #      - reindex
       #      - -d
       #      - /var/gerrit
+      ##      - --index
+      ##      - changes
       #    env:
       #      - name: _JAVA_OPTIONS
       #        value: -Xmx300m -XX:MaxMetaspaceSize=150m -XX:+CMSClassUnloadingEnabled -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -XX:+UnlockExperimentalVMOptions -XX:+UseSerialGC -XX:+UseCompressedOops -XX:+AlwaysPreTouch -XX:+ScavengeBeforeFullGC -XX:+DisableExplicitGC
@@ -141,11 +143,11 @@
       #        subPath: gerrit.config
       containers:
         - name: master
-          image: docker.benkard.de/mulk/gerrit:3.4.1-2
+          image: docker.benkard.de/mulk/gerrit:3.7.1-1
 
           # for running `init`:
           #
-          #   java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit
+          #   kubectl exec -ti deploy/gerrit -- java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit
           #
           # or the H2 console:
           #
diff --git a/git/git.yaml b/git/git.yaml
index 2e66b9d..a0ad441 100644
--- a/git/git.yaml
+++ b/git/git.yaml
@@ -236,7 +236,7 @@
             - name: github-secrets
               secret:
                 secretName: github-secrets
-                defaultMode: 0400
+                defaultMode: 0444
             - name: data
               persistentVolumeClaim:
                 claimName: git-data
@@ -244,6 +244,9 @@
           containers:
             - name: master
               image: buildpack-deps:scm
+              securityContext:
+                runAsUser: 100
+                runAsGroup: 101
               command:
                 - bash
                 - -c
@@ -259,22 +262,30 @@
                       fibers \
                       hellonet \
                       instadump \
+                      jgvariant \
                       json-template-r6rs \
                       json-template-racket \
                       json-template-typed-racket \
                       logikorr \
                       mulkcms \
+                      mulkcms2 \
                       mulkjournal \
                       mulklib \
+                      mulkontainers \
                       mulkrypt-for-racket \
                       mulkyid \
                       objective-cl \
+                      quarkus-googlecloud-jsonlogging \
                       toilet
                   do
                       cd "/git/repositories/mulk/$x.git"
+                      git fetch "https://gitlab.benkard.de/mulk/${x}.git" master:master
                       git push "git@github.com:benkard/${x}.git" master
                   done
                   true
+              env:
+                - name: HOME
+                  value: /nonexistent
               resources:
                 limits:
                   memory: 100Mi
@@ -283,7 +294,7 @@
                   memory: 100Mi
               volumeMounts:
                 - name: github-secrets
-                  mountPath: /root/.ssh
+                  mountPath: /nonexistent/.ssh
                   readOnly: true
                 - name: data
                   mountPath: /git
diff --git a/tikiwiki/docker-tikiwiki/Dockerfile b/tikiwiki/docker-tikiwiki/Dockerfile
index 958826f..9ef2919 100644
--- a/tikiwiki/docker-tikiwiki/Dockerfile
+++ b/tikiwiki/docker-tikiwiki/Dockerfile
@@ -1,4 +1,4 @@
-FROM tikiwiki/php:7.2-apache
+FROM tikiwiki/php:7.4-apache
 LABEL mantainer "TikiWiki <tikiwiki-devel@lists.sourceforge.net>"
 
 ARG COMMIT=a58da1b2478eb52627c06414db307b338352aa85