diff --git a/abra/servers/sootie.resisttechmonopolies.online/calibre.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/calibre.resisttechmonopolies.online.env
deleted file mode 100644
index fbcd86f..0000000
--- a/abra/servers/sootie.resisttechmonopolies.online/calibre.resisttechmonopolies.online.env
+++ /dev/null
@@ -1,13 +0,0 @@
-TYPE=calibre-web
-
-DOMAIN=calibre.resisttechmonopolies.online
-LETS_ENCRYPT_ENV=production
-
-DOCKER_MODS="linuxserver/calibre-web:calibre"
-OAUTHLIB_RELAX_TOKEN_SCOPE=1
-TZ="America/Los_Angeles"
-
-DEBUG=False
-
-# oauth2 support
-COMPOSE_FILE="compose.yml:compose.oauth2.yml"
diff --git a/abra/servers/sootie.resisttechmonopolies.online/collabora.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/collabora.resisttechmonopolies.online.env
deleted file mode 100644
index ce76fe1..0000000
--- a/abra/servers/sootie.resisttechmonopolies.online/collabora.resisttechmonopolies.online.env
+++ /dev/null
@@ -1,7 +0,0 @@
-TYPE=collabora
-DOMAIN=collabora.resisttechmonopolies.online
-LETS_ENCRYPT_ENV=production
-NEXTCLOUD_DOMAIN=nextcloud.resisttechmonopolies.online
-ADMIN_USERNAME=admin
-SECRET_ADMIN_PASSWORD_VERSION=v1
-FRAME_ANCESTORS=
diff --git a/abra/servers/sootie.resisttechmonopolies.online/focalboard.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/focalboard.resisttechmonopolies.online.env
deleted file mode 100644
index 5432e61..0000000
--- a/abra/servers/sootie.resisttechmonopolies.online/focalboard.resisttechmonopolies.online.env
+++ /dev/null
@@ -1,7 +0,0 @@
-TYPE=focalboard
-
-DOMAIN=focalboard.resisttechmonopolies.online
-
-## Domain aliases
-#EXTRA_DOMAINS=', `www.focalboard.resisttechmonopolies.online`'
-LETS_ENCRYPT_ENV=production
diff --git a/abra/servers/sootie.resisttechmonopolies.online/hedgedoc.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/hedgedoc.resisttechmonopolies.online.env
new file mode 100644
index 0000000..b94ccda
--- /dev/null
+++ b/abra/servers/sootie.resisttechmonopolies.online/hedgedoc.resisttechmonopolies.online.env
@@ -0,0 +1,59 @@
+TYPE=hedgedoc:3.0.8+1.10.7
+TIMEOUT=300
+ENABLE_AUTO_UPDATE=true
+ENABLE_BACKUPS=true
+
+DOMAIN=hedgedoc.resisttechmonopolies.online
+## Domain aliases
+#EXTRA_DOMAINS=', `www.hedgedoc.resisttechmonopolies.online`'
+LETS_ENCRYPT_ENV=production
+
+SECRET_SESSION_SECRET_VERSION=v1
+
+COMPOSE_FILE="compose.yml"
+
+# Anubis
+#COMPOSE_FILE="$COMPOSE_FILE:compose.anubis.yml"
+
+# PostgreSQL
+
+#COMPOSE_FILE="$COMPOSE_FILE:compose.postgresql.yml"
+#SECRET_DB_PASSWORD_VERSION=v1
+
+# OAuth, see https://docs.hedgedoc.org/guides/auth/keycloak/
+
+#COMPOSE_FILE="$COMPOSE_FILE:compose.oauth.yml"
+#CMD_OAUTH2_PROVIDERNAME="Keycloak"
+#CMD_OAUTH2_CLIENT_ID="hedgedoc"
+#CMD_OAUTH2_AUTHORIZATION_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/auth"
+#CMD_OAUTH2_TOKEN_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/token"
+#CMD_OAUTH2_USER_PROFILE_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/userinfo"
+#CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR=ocs.data.id
+#CMD_OAUTH2_USER_PROFILE_ID_ATTR=
+#CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR=ocs.data.display-name
+#CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR=ocs.data.email
+#CMD_OAUTH2_PROVIDERNAME=Keycloak
+#CMD_OAUTH2_SCOPE="openid email profile"
+#
+#SECRET_OAUTH_KEY_VERSION=v1
+
+# Options, see https://docs.hedgedoc.org/configuration/
+
+# CMD_ALLOW_ANONYMOUS=true
+# CMD_ALLOW_ANONYMOUS_EDITS=false
+# CMD_ALLOW_EMAIL_REGISTER=true
+# CMD_ALLOW_FREEURL=false
+# CMD_REQUIRE_FREEURL_AUTHENTICATION=true
+# CMD_ALLOW_GRAVATAR=true
+# CMD_ALLOW_ORIGIN=localhost
+# CMD_COOKIE_POLICY=lax
+# CMD_CSP_ADD_DISQUS=false
+# CMD_CSP_ADD_GOOGLE_ANALYTICS=false
+# CMD_CSP_ENABLE=true
+# CMD_CSP_REPORTURI=undefined
+# CMD_DEFAULT_PERMISSION=editable
+# CMD_EMAIL=true
+# CMD_SESSION_LIFE=1209600000
+# Only present in config.json (no equivalent env var):
+# DOCUMENT_MAX_LENGTH=100000
+# CMD_ENABLE_UPLOADS=registered
\ No newline at end of file
diff --git a/abra/servers/sootie.resisttechmonopolies.online/mb.sootie.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/mb.sootie.resisttechmonopolies.online.env
new file mode 100644
index 0000000..687a3be
--- /dev/null
+++ b/abra/servers/sootie.resisttechmonopolies.online/mb.sootie.resisttechmonopolies.online.env
@@ -0,0 +1,18 @@
+TYPE=maubot:1.3.0+v0.6.0
+
+DOMAIN=mb.sootie.resisttechmonopolies.online
+
+## Domain aliases
+#EXTRA_DOMAINS=', `www.maubot.resisttechmonopolies.online`'
+
+LETS_ENCRYPT_ENV=production
+
+HOMESERVER_HOST=matrix.resisttechmonopolies.online
+# Client-server API URL
+HOMESERVER_URL=https://matrix.resisttechmonopolies.online
+
+ADMIN_USER_NAME=charlie
+
+## Secrets
+SECRET_ADMIN_PASSWORD_VERSION=v1
+SECRET_HOMESERVER_REGISTRATION_VERSION=v1
\ No newline at end of file
diff --git a/abra/servers/sootie.resisttechmonopolies.online/radicale.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/radicale.resisttechmonopolies.online.env
index 73d4f31..0cc3dea 100644
--- a/abra/servers/sootie.resisttechmonopolies.online/radicale.resisttechmonopolies.online.env
+++ b/abra/servers/sootie.resisttechmonopolies.online/radicale.resisttechmonopolies.online.env
@@ -1,6 +1,6 @@
-TYPE=radicale
+TYPE=radicale:0.1.0+3.0.6.0
 
 DOMAIN=radicale.resisttechmonopolies.online
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.radicale.resisttechmonopolies.online`'
-LETS_ENCRYPT_ENV=production
+LETS_ENCRYPT_ENV=production
\ No newline at end of file
diff --git a/abra/servers/sootie.resisttechmonopolies.online/traefik.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/t.sootie.resisttechmonopolies.online.env
similarity index 68%
rename from abra/servers/sootie.resisttechmonopolies.online/traefik.resisttechmonopolies.online.env
rename to abra/servers/sootie.resisttechmonopolies.online/t.sootie.resisttechmonopolies.online.env
index 14ef6e6..f281dbb 100644
--- a/abra/servers/sootie.resisttechmonopolies.online/traefik.resisttechmonopolies.online.env
+++ b/abra/servers/sootie.resisttechmonopolies.online/t.sootie.resisttechmonopolies.online.env
@@ -1,14 +1,16 @@
-TYPE=traefik:3.7.0+v3.6.2
-TIMEOUT=300
+TYPE=traefik:5.1.1+v3.6.15
+#TIMEOUT=300
 ENABLE_AUTO_UPDATE=true
 ENABLE_BACKUPS=true
 
-DOMAIN=traefik.resisttechmonopolies.online
+DOMAIN=t.sootie.resisttechmonopolies.online
 LETS_ENCRYPT_ENV=production
+
 LETS_ENCRYPT_EMAIL=linnealovespie@proton.me
-DASHBOARD_ENABLED=false
+DASHBOARD_ENABLED=true
 # WARN, INFO etc.
 LOG_LEVEL=WARN
+LOG_MAX_AGE=1
 
 # This is here so later lines can extend it; you likely don't wanna edit
 COMPOSE_FILE="compose.yml"
@@ -17,8 +19,14 @@ COMPOSE_FILE="compose.yml"
 # General settings                                                  #
 #####################################################################
 
-## Host-mode networking
-COMPOSE_FILE="$COMPOSE_FILE:compose.host.yml"
+## Ingress-mode port publishing for ports 80 and 443
+##
+## /!\ Using this prevents the use of any compose override adding
+##     published ports to the traefik_app service (almost all of them)
+##     and it prevents the use of IPv6 for ingress traffic.
+##     Do not uncomment unless you know exactly what you are doing
+##
+#COMPOSE_FILE="$COMPOSE_FILE:compose.no-host.yml"
 
 ## "Headless mode" (no domain configured)
 #COMPOSE_FILE="$COMPOSE_FILE:compose.headless.yml"
@@ -28,8 +36,10 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.host.yml"
 #####################################################################
 
 ## Enable dns challenge (for wildcard domains)
-##   https://doc.traefik.io/traefik/https/acme/#dnschallenge
+##   https://go-acme.github.io/lego/dns/#dns-providers
 #LETS_ENCRYPT_DNS_CHALLENGE_ENABLED=1
+## *Currently* one of ovh, gandi, gandiv5, digitalocean, azure, porkbun.
+## Uncomment the corresponding provider below to insert your secret token/key.
 #LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER=ovh
 
 ## OVH, https://ovh.com
@@ -57,6 +67,25 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.host.yml"
 #DIGITALOCEAN_ENABLED=1
 #SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION=v1
 
+## Azure, https://azure.com
+## To insert your Azure client secret:
+## abra app secret insert {myapp.example.coop} azure_secret v1 "<CLIENT_SECRET>"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.azure.yml"
+#AZURE_ENABLED=1
+#AZURE_TENANT_ID=
+#AZURE_CLIENT_ID=
+#AZURE_SUBSCRIPTION_ID=
+#AZURE_RESOURCE_GROUP=
+#SECRET_AZURE_SECRET_VERSION=v1
+
+## Porkbun, https://porkbun.com
+## To insert your secrets:
+## abra app secret insert 1312.net pb_api_key v1 pk1_413
+## abra app secret insert 1312.net pb_s_api_key v1 sk1_612
+#COMPOSE_FILE="$COMPOSE_FILE:compose.porkbun.yml"
+#SECRET_PORKBUN_API_KEY_VERSION=v1
+#SECRET_PORKBUN_SECRET_API_KEY_VERSION=v1
+
 #####################################################################
 # Manual wildcard certificate insertion                             #
 #####################################################################
@@ -93,14 +122,16 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.host.yml"
 
 ## Enable prometheus metrics collection
 ## used used by the coop-cloud monitoring stack
+## BASIC_AUTH should also be enabled
 #COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"
 #METRICS_ENABLED=1
+#METRICS_FQDN=metrics.t.sootie.resisttechmonopolies.online
 
 #####################################################################
 # File provider directory configuration                             #
 # (Route bare metal and non-docker services on the machine!)        #
 #####################################################################
-FILE_PROVIDER_DIRECTORY_ENABLED=1
+#FILE_PROVIDER_DIRECTORY_ENABLED=1
 
 #####################################################################
 # Additional services                                               #
@@ -118,6 +149,10 @@ FILE_PROVIDER_DIRECTORY_ENABLED=1
 # COMPOSE_FILE="$COMPOSE_FILE:compose.gitea.yml"
 # GITEA_SSH_ENABLED=1
 
+## P2Panda UDP
+# COMPOSE_FILE="$COMPOSE_FILE:compose.p2panda.yml"
+# P2PANDA_ENABLED=1
+
 ## Foodsoft SMTP
 # COMPOSE_FILE="$COMPOSE_FILE:compose.foodsoft.yml"
 # FOODSOFT_SMTP_ENABLED=1
@@ -145,4 +180,29 @@ FILE_PROVIDER_DIRECTORY_ENABLED=1
 ## "Web alt", an alternative web port
 # NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this
 #COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
-#WEB_ALT_ENABLED=1
\ No newline at end of file
+#WEB_ALT_ENABLED=1
+
+## Matrix
+#COMPOSE_FILE="$COMPOSE_FILE:compose.irc.yml"
+#IRC_ENABLED=1
+
+## Garage
+#COMPOSE_FILE="$COMPOSE_FILE:compose.garage.yml"
+#GARAGE_RPC_ENABLED=1
+
+## Nextcloud Talk HPB
+#COMPOSE_FILE="$COMPOSE_FILE:compose.nextcloud-talk-hpb.yml"
+#NEXTCLOUD_TALK_HPB_ENABLED=1
+
+## Anubis
+#COMPOSE_FILE="$COMPOSE_FILE:compose.anubis.yml"
+#ANUBIS_COOKIE_DOMAIN=example.com
+#ANUBIS_DOMAIN=anubis.example.com
+#ANUBIS_REDIRECT_DOMAINS=
+#ANUBIS_OG_PASSTHROUGH=true
+#ANUBIS_OG_EXPIRY_TIME=1h
+#ANUBIS_OG_CACHE_CONSIDER_HOST=true
+#ANUBIS_SERVE_ROBOTS_TXT=true
+
+## Enable onion service support
+#ONION_ENABLED=1
\ No newline at end of file