diff --git a/gitea/fly.toml b/gitea/fly.toml
index 130c7b1..86ef3b3 100644
--- a/gitea/fly.toml
+++ b/gitea/fly.toml
@@ -6,10 +6,11 @@ kill_signal = "SIGINT"
 kill_timeout = 5
 
 [build]
-  image = "codeberg.org/forgejo/forgejo:latest"
+  image = "codeberg.org/forgejo/forgejo:1.18.5-0"
 
 [env]
   GITEA____APP_NAME = "git.mat.services: Git for us"
+  GITEA__ui__DEFAULT_THEME = "forgejo-auto"
   "GITEA__ui.meta__AUTHOR" = "git.mat.services: Git for us"
   GITEA__database__DB_TYPE = "sqlite3"
   GITEA__database__PATH = "/data/gitea/gitea.db"
diff --git a/goatcounter/Dockerfile b/goatcounter/Dockerfile
index 51b5784..6fc6b93 100644
--- a/goatcounter/Dockerfile
+++ b/goatcounter/Dockerfile
@@ -2,8 +2,8 @@ FROM alpine:latest
 
 WORKDIR /goatcounter
 
-ENV GOATCOUNTER_VERSION 'v2.2.3'
-ENV GOATCOUNTER_TAG 'dev'
+ENV GOATCOUNTER_VERSION 'v2.4.1'
+ENV GOATCOUNTER_TAG $GOATCOUNTER_VERSION
 
 RUN apk add --no-cache ca-certificates wget bash \
   && update-ca-certificates --fresh