diff --git a/.env.sample b/.env.sample
index 9869eb8..76d17ec 100644
--- a/.env.sample
+++ b/.env.sample
@@ -37,8 +37,8 @@ LETS_ENCRYPT_ENV=production
 ## Uncomment to use MariaDB instead of sqlite
 #COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
 #USE_MARIADB=true
-#SECRET_DB_ROOT_PASSWORD_VERSION=v1
-#SECRET_DB_PASSWORD_VERSION=v1
+#DB_ROOT_PASSWORD_VERSION=v1
+#DB_PASSWORD_VERSION=v1
 
 ## Uncomment to use Keycloak. See README.md for explanation
 #KEYCLOAK_ENABLED=1
@@ -47,5 +47,5 @@ LETS_ENCRYPT_ENV=production
 #OAUTH_HOST=
 #OAUTH_CLIENT_SECRET=
 #OAUTH_LOGIN_BUTTON=
-#CONFIG_OAUTH_WRITEFREELY_VERSION=v1
-#SECRET_OAUTH_CLIENT_SECRET_VERSION=v1
+#OAUTH_WRITEFREELY_VERSION=v1
+#OAUTH_CLIENT_SECRET_VERSION=v1
diff --git a/compose.keycloak.yml b/compose.keycloak.yml
index a1c2917..123b95d 100644
--- a/compose.keycloak.yml
+++ b/compose.keycloak.yml
@@ -4,26 +4,9 @@ version: "3.8"
 services:
   app:
     secrets:
-      - db_password
       - oauth_client_secret
-    environment:
-      - FEDERATION
-      - HOST_URL
-      - KEYCLOAK_ENABLED
-      - LOCAL_TIMELINE
-      - OAUTH_CLIENT_ID
-      - OAUTH_HOST
-      - OAUTH_LOGIN_BUTTON
-      - OPEN_DELETION
-      - OPEN_REGISTRATION
-      - PRIVATE
-      - PUBLIC_STATS
-      - SITE_DESCRIPTION
-      - SITE_EDITOR
-      - SITE_NAME
-      - SITE_THEME
 
 secrets:
   oauth_client_secret:
     external: true
-    name: ${STACK_NAME}_oauth_client_secret_${SECRET_OAUTH_CLIENT_SECRET_VERSION}
+    name: ${STACK_NAME}_oauth_client_secret_${OAUTH_CLIENT_SECRET_VERSION}
diff --git a/compose.mariadb.yml b/compose.mariadb.yml
index 90f82b5..cd9e7e7 100644
--- a/compose.mariadb.yml
+++ b/compose.mariadb.yml
@@ -29,7 +29,7 @@ volumes:
 secrets:
   db_root_password:
     external: true
-    name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
+    name: ${STACK_NAME}_db_root_password_${DB_ROOT_PASSWORD_VERSION}
   db_password:
     external: true
-    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
+    name: ${STACK_NAME}_db_password_${DB_PASSWORD_VERSION}
diff --git a/compose.yml b/compose.yml
index 86b9d7f..a6d760c 100644
--- a/compose.yml
+++ b/compose.yml
@@ -4,18 +4,6 @@ version: "3.8"
 services:
   app:
     image: git.coopcloud.tech/coop-cloud-chaos-patchs/docker-writefreely:v0.16.0
-    environment:
-      - FEDERATION
-      - HOST_URL
-      - LOCAL_TIMELINE
-      - OPEN_DELETION
-      - OPEN_REGISTRATION
-      - PRIVATE
-      - PUBLIC_STATS
-      - SITE_DESCRIPTION
-      - SITE_EDITOR
-      - SITE_NAME
-      - SITE_THEME
     configs:
       - source: config_ini
         # Can't put the config file in /data or else the volume mounts conflict