diff --git a/docker-compose.yml b/docker-compose.yml
index 833e672d3..f9e7a0910 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,11 +64,11 @@ services:
       - "3000:3000"
       - "3001:3001"
     environment:
+      - ENVIRONMENT=development
       - JAEGER_AGENT_HOST=jaeger
       - JAEGER_SAMPLER_TYPE=const
       - JAEGER_SAMPLER_PARAM=1
       - JAEGER_SERVICE_NAME=testserver
-      - SENTRY_ENVIRONMENT=development
       - SENTRY_RELEASE=HEAD
       - PACE_LIVETEST_INTERVAL=10s
       - LOG_FORMAT=console
diff --git a/maintenance/errors/README.md b/maintenance/errors/README.md
index 6d539159d..a995724c5 100644
--- a/maintenance/errors/README.md
+++ b/maintenance/errors/README.md
@@ -9,9 +9,9 @@
 
 ## Environment based configuration
 
+* `ENVIRONMENT`
+    * Default environment of sentry reported in the dashboard
 * `SENTRY_DSN`
     * URL of the sentry DSN
-* `SENTRY_ENVIRONMENT`
-    * Environment of sentry reported in the dashboard
 * `SENTRY_RELEASE`
     * Name of the release e.g. git commit or similar
\ No newline at end of file
diff --git a/maintenance/errors/raven/client.go b/maintenance/errors/raven/client.go
index 8915df285..6fb2b7a54 100644
--- a/maintenance/errors/raven/client.go
+++ b/maintenance/errors/raven/client.go
@@ -376,7 +376,7 @@ func newClient(tags map[string]string) *Client {
 		log.Warnf("DSN environment was set to %q but failed: %v", dsn, err)
 	}
 	client.SetRelease(os.Getenv("SENTRY_RELEASE"))
-	client.SetEnvironment(os.Getenv("SENTRY_ENVIRONMENT"))
+	client.SetEnvironment(os.Getenv("ENVIRONMENT"))
 	return client
 }