diff --git a/config.py b/config.py
index d731604..99c1966 100644
--- a/config.py
+++ b/config.py
@@ -62,5 +62,7 @@ WEBSOCKIFY_TARGET_FILE = environ.get('PROXSTAR_WEBSOCKIFY_TARGET_FILE',
                                      '/opt/app-root/src/targets')
 
 # SENTRY
-# Do not set the DSN for local development
-SENTRY_DSN = environ.get("CONDITIONAL_SENTRY_DSN", "")
\ No newline at end of file
+# If you set the sentry dsn locally, make sure you use the local-dev or some
+# other local environment, so we can separate local errors from production
+SENTRY_DSN = environ.get("PROXSTAR_SENTRY_DSN", "")
+SENTRY_ENV = environ.get("PROXSTAR_SENTRY_ENV", "local-dev")
diff --git a/proxstar/__init__.py b/proxstar/__init__.py
index 41a6c96..05ff9bf 100644
--- a/proxstar/__init__.py
+++ b/proxstar/__init__.py
@@ -47,7 +47,8 @@ app.config['GIT_REVISION'] = subprocess.check_output(
 # Sentry setup
 sentry_sdk.init(
     dsn=app.config['SENTRY_DSN'],
-    integrations=[FlaskIntegration(), RqIntegration(), SqlalchemyIntegration()]
+    integrations=[FlaskIntegration(), RqIntegration(), SqlalchemyIntegration()],
+    environment=app.config['SENTRY_ENV']
 )
 
 with open('proxmox_ssh_key', 'w') as ssh_key_file:
diff --git a/rqsettings.py b/rqsettings.py
index 5e59e75..1f0cc7f 100644
--- a/rqsettings.py
+++ b/rqsettings.py
@@ -10,5 +10,6 @@ else:
 
 sentry_sdk.init(
     config.SENTRY_DSN,
-    integrations=[RqIntegration()]
+    integrations=[RqIntegration()],
+    environment=config.SENTRY_ENV
 )