diff --git a/.env.local b/.env.local
deleted file mode 100644
index 8099ed8..0000000
--- a/.env.local
+++ /dev/null
@@ -1,5 +0,0 @@
-POSTGRES_PASSWORD=buildbot
-POSTGRES_PASSWORD=changeme!
-BUILDBOT_CONFIG_URL=''
-GITEA_URL=https://projects.blender.org
-BUILDBOT_WEB_URL=http://localhost:8010/
\ No newline at end of file
diff --git a/buildbot/config/conf/local/machines.py b/buildbot/config/conf/local/machines.py
index fb430e7..e2d9938 100644
--- a/buildbot/config/conf/local/machines.py
+++ b/buildbot/config/conf/local/machines.py
@@ -27,5 +27,5 @@ def get_worker_password(worker_name: str) -> str:
     return "localhost"
 
 
-def get_worker_names(ENVIRONMENT: str):
+def get_worker_names(environment: str):
     return _worker_names
diff --git a/buildbot/config/setup.py b/buildbot/config/setup.py
index abf0730..f1ee021 100644
--- a/buildbot/config/setup.py
+++ b/buildbot/config/setup.py
@@ -31,7 +31,7 @@ importlib.reload(conf.worker)
 importlib.reload(gitea.blender)
 importlib.reload(pipeline)
 
-ENVIRONMENT = os.environ.get("ENVIRONMENT", default="LOCAL")
+environment = os.environ.get("BUILDBOT_environment", default="LOCAL")
 
 
 def setup() -> Dict[str, Any]:
@@ -43,7 +43,7 @@ def setup() -> Dict[str, Any]:
 
     # Workers
     print("*** Creating platform workers")
-    platform_worker_names = conf.machines.fetch_platform_worker_names(ENVIRONMENT)
+    platform_worker_names = conf.machines.fetch_platform_worker_names(environment)
     workers: List[buildbot.plugins.worker.Worker] = []
     configured_worker_names = set()
     for worker_names in platform_worker_names.values():
@@ -55,7 +55,7 @@ def setup() -> Dict[str, Any]:
             workers += [
                 buildbot.plugins.worker.Worker(
                     worker_name,
-                    conf.machines.get_worker_password(ENVIRONMENT, worker_name),
+                    conf.machines.get_worker_password(environment, worker_name),
                     max_builds=1,
                     keepalive_interval=3600,
                 )
@@ -69,7 +69,7 @@ def setup() -> Dict[str, Any]:
     c["workers"] = workers
 
     # Builders and Schedulers
-    builders, schedulers = pipeline.populate(ENVIRONMENT)
+    builders, schedulers = pipeline.populate(environment)
     c["builders"] = builders
     c["schedulers"] = schedulers
 
@@ -79,7 +79,7 @@ def setup() -> Dict[str, Any]:
     # status of each build will be pushed to these targets. buildbot/reporters/*.py
     # has a variety to choose from, like IRC bots.
 
-    gitea_status_service = gitea.blender.setup_service(ENVIRONMENT)
+    gitea_status_service = gitea.blender.setup_service(environment)
     if gitea_status_service:
         c["services"] = [gitea_status_service]
     else:
@@ -90,7 +90,7 @@ def setup() -> Dict[str, Any]:
     # the 'title' string will appear at the top of this buildbot installation's
     # home pages (linked to the 'titleURL').
 
-    c["title"] = f"Blender Buildbot - {ENVIRONMENT}"
+    c["title"] = f"Blender Buildbot - {environment}"
     c["titleURL"] = "https://projects.blender.org"
 
     # the 'buildbotURL' string should point to the location where the buildbot's
@@ -113,10 +113,10 @@ def setup() -> Dict[str, Any]:
     c["buildbotNetUsageData"] = None
 
     # Authentication
-    c["www"]["auth"] = conf.auth.fetch_authentication(ENVIRONMENT)
+    c["www"]["auth"] = conf.auth.fetch_authentication(environment)
 
     # Authorization
-    c["www"]["authz"] = conf.auth.fetch_authorization(ENVIRONMENT)
+    c["www"]["authz"] = conf.auth.fetch_authorization(environment)
 
     # Disable UI - does not work
     c["www"]["plugins"] = {
diff --git a/docker-compose.yml b/docker-compose.yml
index d4a1609..19a7868 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - 8010:8010
     environment:
       - 'BUILDBOT_CONFIG_DIR=${BUILDBOT_CONFIG_DIR:-config}'
-      # - 'BUILDBOT_CONFIG_URL=${BUILDBOT_CONFIG_URL:-https://git.braak.pro/api/packages/bartvdbraak/generic/builder.braak.pro/main/config.tar.gz}'
+      - 'BUILDBOT_ENVIRONMENT=${BUILDBOT_ENVIRONMENT:-LOCAL}'
       - 'BUILDBOT_WORKER_PORT=${BUILDBOT_WORKER_PORT:-9989}'
       - 'BUILDBOT_WEB_URL=${BUILDBOT_WEB_URL:-http://localhost:8010/}'
       - 'BUILDBOT_WEB_PORT=${BUILDBOT_WEB_PORT:-tcp:port=8010}'
@@ -56,8 +56,9 @@ services:
     environment:
       - 'BUILDMASTER=${BUILDMASTER:-buildbot-master}'
       - 'BUILDMASTER_PORT=${BUILDBOT_WORKER_PORT:-9989}'
-      - 'WORKERNAME=${WORKERNAME:-example-worker}'
-      - 'WORKERPASS=${WORKERPASS:-pass}'
+      - 'BUILDBOT_ENVIRONMENT=${BUILDBOT_ENVIRONMENT:-LOCAL}'
+      - 'WORKERNAME=${WORKERNAME:-localhost}'
+      - 'WORKERPASS=${WORKERPASS:-localhost}'
       - 'WORKER_ENVIRONMENT_BLACKLIST=${WORKER_ENVIRONMENT_BLACKLIST:-DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST}'
     healthcheck:
       test: