diff --git a/compose.yaml b/compose.yaml
index 60ffb6ab..97147686 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -3,44 +3,8 @@ services:
     image: danielszabo99/microbin:latest
     restart: always
     ports:
-     - "${MICROBIN_PORT}:8080"
+      - "${MICROBIN_PORT}:8080"
     volumes:
-     - ./microbin-data:/app/microbin_data
-    environment:
-      MICROBIN_BASIC_AUTH_USERNAME: ${MICROBIN_BASIC_AUTH_USERNAME}
-      MICROBIN_BASIC_AUTH_PASSWORD: ${MICROBIN_BASIC_AUTH_PASSWORD}
-      MICROBIN_ADMIN_USERNAME: ${MICROBIN_ADMIN_USERNAME}
-      MICROBIN_ADMIN_PASSWORD: ${MICROBIN_ADMIN_PASSWORD}
-      MICROBIN_EDITABLE: ${MICROBIN_EDITABLE}
-      MICROBIN_FOOTER_TEXT: ${MICROBIN_FOOTER_TEXT}
-      MICROBIN_HIDE_FOOTER: ${MICROBIN_HIDE_FOOTER}
-      MICROBIN_HIDE_HEADER: ${MICROBIN_HIDE_HEADER}
-      MICROBIN_HIDE_LOGO: ${MICROBIN_HIDE_LOGO}
-      MICROBIN_NO_LISTING: ${MICROBIN_NO_LISTING}
-      MICROBIN_HIGHLIGHTSYNTAX: ${MICROBIN_HIGHLIGHTSYNTAX}
-      MICROBIN_BIND: ${MICROBIN_BIND}
-      MICROBIN_PRIVATE: ${MICROBIN_PRIVATE}
-      MICROBIN_PURE_HTML: ${MICROBIN_PURE_HTML}
-      MICROBIN_DATA_DIR: ${MICROBIN_DATA_DIR}
-      MICROBIN_JSON_DB: ${MICROBIN_JSON_DB}
-      MICROBIN_PUBLIC_PATH: ${MICROBIN_PUBLIC_PATH}
-      MICROBIN_SHORT_PATH: ${MICROBIN_SHORT_PATH}
-      MICROBIN_READONLY: ${MICROBIN_READONLY}
-      MICROBIN_SHOW_READ_STATS: ${MICROBIN_SHOW_READ_STATS}
-      MICROBIN_TITLE: ${MICROBIN_TITLE}
-      MICROBIN_THREADS: ${MICROBIN_THREADS}
-      MICROBIN_GC_DAYS: ${MICROBIN_GC_DAYS}
-      MICROBIN_ENABLE_BURN_AFTER: ${MICROBIN_ENABLE_BURN_AFTER}
-      MICROBIN_DEFAULT_BURN_AFTER: ${MICROBIN_DEFAULT_BURN_AFTER}
-      MICROBIN_WIDE: ${MICROBIN_WIDE}
-      MICROBIN_QR: ${MICROBIN_QR}
-      MICROBIN_ETERNAL_PASTA: ${MICROBIN_ETERNAL_PASTA}
-      MICROBIN_ENABLE_READONLY: ${MICROBIN_ENABLE_READONLY}
-      MICROBIN_DEFAULT_EXPIRY: ${MICROBIN_DEFAULT_EXPIRY}
-      MICROBIN_NO_FILE_UPLOAD: ${MICROBIN_NO_FILE_UPLOAD}
-      MICROBIN_CUSTOM_CSS: ${MICROBIN_CUSTOM_CSS}
-      MICROBIN_HASH_IDS: ${MICROBIN_HASH_IDS}
-      MICROBIN_ENCRYPTION_CLIENT_SIDE: ${MICROBIN_ENCRYPTION_CLIENT_SIDE}
-      MICROBIN_ENCRYPTION_SERVER_SIDE: ${MICROBIN_ENCRYPTION_SERVER_SIDE}
-      MICROBIN_MAX_FILE_SIZE_ENCRYPTED_MB: ${MICROBIN_MAX_FILE_SIZE_ENCRYPTED_MB}
-      MICROBIN_MAX_FILE_SIZE_UNENCRYPTED_MB: ${MICROBIN_MAX_FILE_SIZE_UNENCRYPTED_MB}
+      - ./microbin-data:/app/microbin_data
+    env_file:
+      - .env