diff --git a/docker-compose.yml b/docker-compose.yml
index 5301898..49a4a7d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,6 +27,8 @@ services:
       - IS_PUBLIC=${GONITO_IS_PUBLIC:-true}
       - JSON_WEB_KEY=${JSON_WEB_KEY}
       - VIEWING_PROGRESS_STYLE=${GONITO_VIEWING_PROGRESS_STYLE:-with-web-sockets}
+      - AUTO_TEAM=${GONITO_AUTO_TEAM:-false}
+      - TEAM_FIELD=$GONITO_TEAM_FIELD
     expose:
       - "3000"
     volumes:
diff --git a/sample.env b/sample.env
index 54f8ad7..2389027 100644
--- a/sample.env
+++ b/sample.env
@@ -11,6 +11,10 @@ NGINX_CERTIFICATE_DIR=/home/user/certs
 GONITO_IS_PUBLIC=true
 GONITO_SSH_DIRECTORY=/home/user/.ssh
 GONITO_VIEWING_PROGRESS_STYLE=with-web-sockets
+GONITO_AUTO_TEAM=false
+# given_name from Keycloak will be considered as the team name
+# not the actual given name
+GONITO_TEAM_FIELD=given_name
 
 # JWK key
 #