diff --git a/redxen.eu/config.mk b/redxen.eu/config.mk
index 800ad4b..ddbf838 100644
--- a/redxen.eu/config.mk
+++ b/redxen.eu/config.mk
@@ -2,10 +2,7 @@
 SECRETS := \
 	redxen.eu/daemons/murmurd/secrets/mregpass \
 	redxen.eu/data/letsencrypt/secrets/private.key \
-	redxen.eu/daemons/gitea/base/secrets/internal_token \
-	redxen.eu/daemons/gitea/base/secrets/mailer_passwd \
-	redxen.eu/daemons/gitea/base/secrets/oauth_jwt_token \
-	redxen.eu/daemons/gitea/base/secrets/secret_key
+	redxen.eu/daemons/gitea/base/secrets/mailer_passwd
 
 # Checkout from other branch without merging or adding file to tracking set
 # Know a cleaner way? Let me know please.
@@ -141,9 +138,6 @@ redxen.eu/daemons/gitea/themed/${BUILD_ID_OUT}: %/${BUILD_ID_OUT} : \
 	redxen.eu/data/gitea-theme/${BUILD_ID_OUT} \
 	redxen.eu/daemons/gitea/base/${BUILD_ID_OUT}
 redxen.eu/daemons/gitea/base/${BUILD_ID_OUT}: %/${BUILD_ID_OUT} : \
-	%/secrets/secret_key \
-	%/secrets/internal_token \
-	%/secrets/oauth_jwt_token \
 	%/secrets/mailer_passwd \
 	%/config.ini \
 	redxen.eu/data/ca/${BUILD_ID_OUT} \
diff --git a/redxen.eu/daemons/gitea/base/Containerfile b/redxen.eu/daemons/gitea/base/Containerfile
index 5d01479..e6c5580 100644
--- a/redxen.eu/daemons/gitea/base/Containerfile
+++ b/redxen.eu/daemons/gitea/base/Containerfile
@@ -2,9 +2,9 @@ FROM alpine AS config-preparer
 
 WORKDIR /root
 ADD config.ini config.ini
-RUN --mount=type=secret,id=secret_key sed -i -e "s|GITEA_SECRET_KEY|$(cat /run/secrets/secret_key)|g" config.ini
-RUN --mount=type=secret,id=internal_token sed -i -e "s|GITEA_INTERNAL_TOKEN|$(cat /run/secrets/internal_token)|g" config.ini
-RUN --mount=type=secret,id=oauth_jwt_token sed -i -e "s|GITEA_OAUTH_JWT_TOKEN|$(cat /run/secrets/oauth_jwt_token)|g" config.ini
+RUN sed -i -e "s|GITEA_SECRET_KEY|$(gitea generate secret SECRET_KEY)|g" config.ini
+RUN sed -i -e "s|GITEA_INTERNAL_TOKEN|$(gite generate secret INTERNAL_TOKEN)|g" config.ini
+RUN sed -i -e "s|GITEA_OAUTH_JWT_TOKEN|$(gitea generate secret JWT_SECRET)|g" config.ini
 RUN --mount=type=secret,id=mailer_passwd sed -i -e "s|GITEA_MAILER_PASSWD|$(cat /run/secrets/mailer_passwd)|g" config.ini
 
 FROM gitea/gitea:latest-rootless
diff --git a/redxen.eu/daemons/gitea/base/config.ini b/redxen.eu/daemons/gitea/base/config.ini
index b5b555b..c02afa5 100644
--- a/redxen.eu/daemons/gitea/base/config.ini
+++ b/redxen.eu/daemons/gitea/base/config.ini
@@ -39,7 +39,6 @@ USER                            = gitea
 DB_RETRIES                      = 1
 
 [ui]
-THEMES                          = auto,arc-green,catppuccin-mocha-flamingo
 DEFAULT_THEME                   = catppuccin-mocha-flamingo
 USE_SERVICE_WORKER              = true