diff --git a/.env.sample b/.env.sample
index 10b50a6..9ad094b 100644
--- a/.env.sample
+++ b/.env.sample
@@ -6,13 +6,15 @@ DOMAIN=n8n.example.com
 #EXTRA_DOMAINS=', `www.n8n.example.com`'
 LETS_ENCRYPT_ENV=production
 
-# Only required if you're not using SSO
-N8N_BASIC_AUTH_USER=username
-
 SECRET_DB_PASSWORD_VERSION=v1
-SECRET_ADMIN_PASSWORD_VERSION=v1
 
 COMPOSE_FILE="compose.yml"
 
 # SSO using traefik-forward-auth
 #COMPOSE_FILE="$COMPOSE_FILE:compose.sso.yml"
+
+# Basic auth
+#COMPOSE_FILE="$COMPOSE_FILE:compose.basicauth.yml"
+#N8N_BASIC_AUTH_ACTIVE=true
+#N8N_BASIC_AUTH_USER=username
+#SECRET_ADMIN_PASSWORD_VERSION=v1
diff --git a/compose.basicauth.yml b/compose.basicauth.yml
new file mode 100644
index 0000000..d4cd7f1
--- /dev/null
+++ b/compose.basicauth.yml
@@ -0,0 +1,15 @@
+version: '3.8'
+
+services:
+  app:
+    environment:
+      - N8N_BASIC_AUTH_ACTIVE=true
+      - N8N_BASIC_AUTH_USER
+      - N8N_BASIC_AUTH_PASSWORD_FILE=/run/secrets/admin_password
+    secrets:
+      - admin_password
+
+secrets:
+  admin_password:
+    external: true
+    name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
diff --git a/compose.yml b/compose.yml
index 4749f0a..2aa525f 100644
--- a/compose.yml
+++ b/compose.yml
@@ -12,9 +12,7 @@ services:
       - DB_POSTGRESDB_DATABASE=n8n
       - DB_POSTGRESDB_USER=root
       - DB_POSTGRESDB_PASSWORD_FILE=/run/secrets/db_password
-      - N8N_BASIC_AUTH_ACTIVE=true
-      - N8N_BASIC_AUTH_USER
-      - N8N_BASIC_AUTH_PASSWORD_FILE=/run/secrets/admin_password
+      - N8N_BASIC_AUTH_ACTIVE=false
       - WEBHOOK_URL=https://${DOMAIN}
       - NODE_FUNCTION_ALLOW_EXTERNAL=moment
     depends_on:
@@ -26,7 +24,6 @@ services:
       - n8n:/home/node/.n8n
     secrets:
       - db_password
-      - admin_password
     deploy:
       update_config:
         failure_action: rollback
@@ -67,9 +64,6 @@ secrets:
   db_password:
     external: true
     name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
-  admin_password:
-    external: true
-    name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
 
 volumes:
   n8n: