diff --git a/forgejo/docker-compose.yml b/forgejo/docker-compose.yml
index 77ff745..86106f3 100644
--- a/forgejo/docker-compose.yml
+++ b/forgejo/docker-compose.yml
@@ -6,7 +6,7 @@ volumes:
 
 services:
   server:
-    image: codeberg.org/forgejo/forgejo
+    image: codeberg.org/forgejo/forgejo:1.21
     restart: always
     volumes:
       - server:/data
diff --git a/grist/.env.gpg b/grist/.env.gpg
index bd0e07a..79d641e 100644
Binary files a/grist/.env.gpg and b/grist/.env.gpg differ
diff --git a/grist/docker-compose.yml b/grist/docker-compose.yml
index 4216627..bf67f2b 100644
--- a/grist/docker-compose.yml
+++ b/grist/docker-compose.yml
@@ -14,14 +14,10 @@ services:
       APP_HOME_URL: https://grist.dmeiburg.de
       GRIST_SESSION_SECRET: ${SECRET}
       GRIST_SANDBOX_FLAVOR: gvisor
-      GRIST_SAML_IDP_UNENCRYPTED: 1
-      GRIST_SAML_SP_HOST: https://grist.dmeiburg.de
-      GRIST_SAML_IDP_LOGIN: https://sso.dmeiburg.de/application/saml/grist/sso/binding/redirect/
-      GRIST_SAML_IDP_LOGOUT: https://sso.dmeiburg.de/if/session-end/grist/
-      GRIST_SAML_IDP_CERTS: /certs/authentik.pem
-      GRIST_SAML_SP_KEY: /certs/grist_private_key.pem
-      GRIST_SAML_SP_CERT: /certs/grist_certificate.pem
       GRIST_FORCE_LOGIN: true
+      GRIST_OIDC_IDP_ISSUER: https://sso.dmeiburg.de/application/o/grist/.well-known/openid-configuration
+      GRIST_OIDC_IDP_CLIENT_ID: ${OIDC_ID}
+      GRIST_OIDC_IDP_CLIENT_SECRET: ${OIDC_SECRET}
     expose: 
         - 8484
 networks:
diff --git a/grist/enabled b/grist/enabled
new file mode 100644
index 0000000..e69de29