diff --git a/.circleci/config.yml b/.circleci/config.yml
index 294156429..a1dc63e27 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,7 +52,7 @@ jobs:
 
       - run:
           name: Test Code
-          command: docker run fx-private-relay python manage.py test
+          command: docker run --entrypoint "python" fx-private-relay manage.py test
 
   deploy:
     docker:
diff --git a/.dockerignore b/.dockerignore
index d4373017d..2e503f79b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
 **/.DS_store
+.env
 .git
 extension
diff --git a/.env-dist b/.env-dist
index 07de5e2b0..afac6d40c 100644
--- a/.env-dist
+++ b/.env-dist
@@ -1,9 +1,9 @@
 FXA_OAUTH_ENDPOINT=https://oauth-stable.dev.lcip.org/v1
 FXA_PROFILE_ENDPOINT=https://stable.dev.lcip.org/profile/v1
-SECRET_KEY=
+SECRET_KEY=unsafe-secret-key-for-dev-envs
 ADMIN_ENABLED=
-SOCKETLABS_SERVER_ID=
-SOCKETLABS_API_KEY=
+SOCKETLABS_SERVER_ID=0
+SOCKETLABS_API_KEY="dummy-value"
 TWILIO_ACCOUNT_SID=
 TWILIO_AUTH_TOKEN=
 TWILIO_SERVICE_ID=
diff --git a/Dockerfile b/Dockerfile
index e835791f1..e31fa4874 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ EXPOSE 8000
 USER app
 
 COPY . /app
+COPY .env-dist /app/.env
 
 RUN pip install -r requirements.txt
 
diff --git a/privaterelay/settings.py b/privaterelay/settings.py
index 689c0087e..c5aabeb45 100644
--- a/privaterelay/settings.py
+++ b/privaterelay/settings.py
@@ -47,7 +47,7 @@ ALLOWED_HOSTS = []
 
 # Get our backing resource configs to check if we should install the app
 ADMIN_ENABLED = config('ADMIN_ENABLED', None)
-SOCKETLABS_SERVER_ID = config('SOCKETLABS_SERVER_ID', None, cast=int)
+SOCKETLABS_SERVER_ID = config('SOCKETLABS_SERVER_ID', 0, cast=int)
 SOCKETLABS_API_KEY = config('SOCKETLABS_API_KEY', None)
 TWILIO_ACCOUNT_SID = config('TWILIO_ACCOUNT_SID', None)
 TWILIO_AUTH_TOKEN = config('TWILIO_AUTH_TOKEN', None)