diff --git a/pavelib/utils/envs.py b/pavelib/utils/envs.py
index 4cfbec7790..69a9e06075 100644
--- a/pavelib/utils/envs.py
+++ b/pavelib/utils/envs.py
@@ -77,7 +77,7 @@ class Env:
     PRINT_SETTINGS_LOG_FILE = GEN_LOG_DIR / "print_settings.log"
 
     # Detect if in a Docker container, and if so which one
-    # USING_DOCKER = SERVER_HOST != '0.0.0.0'
+    USING_DOCKER = SERVER_HOST != '0.0.0.0'
     DEVSTACK_SETTINGS = 'devstack'
     TEST_SETTINGS = 'test'
 
@@ -85,6 +85,10 @@ class Env:
     TEST_DIR = REPO_ROOT / ".testids"
 
     # Configured browser to use for the js test suites
+    SELENIUM_BROWSER = os.environ.get('SELENIUM_BROWSER', 'firefox')
+    if USING_DOCKER:
+        KARMA_BROWSER = 'ChromeDocker' if SELENIUM_BROWSER == 'chrome' else 'FirefoxDocker'
+    else:
     KARMA_BROWSER = 'FirefoxNoUpdates'
 
     # Files used to run each of the js test suites