diff --git a/ansible/roles/celery_task/tasks/main.yml b/ansible/roles/celery_task/tasks/main.yml
index 9ad4a7930..0acbbb913 100644
--- a/ansible/roles/celery_task/tasks/main.yml
+++ b/ansible/roles/celery_task/tasks/main.yml
@@ -1,13 +1,18 @@
 ---
-- name: Copy app secrets
+- name: Copy common secrets
   copy:
-    src: /srv/secrets-newsblur/settings/docker_settings.py
+    src: /srv/secrets-newsblur/settings/common_settings.py
     dest: /srv/newsblur/newsblur_web/local_settings.py
   register: app_changed
 
-- name: Add SERVER_NAME to app secrets
+- name: Copy task env
+  copy:
+    src: /srv/secrets-newsblur/settings/task_env.py
+    dest: /srv/newsblur/newsblur_web/task_env.py
+
+- name: Add SERVER_NAME to task env
   lineinfile:
-    path: /srv/newsblur/newsblur_web/local_settings.py
+    path: /srv/newsblur/newsblur_web/task_env.py
     line: 'SERVER_NAME = "{{ inventory_hostname }}"'
 
 - name: "Start docker containers"
diff --git a/ansible/roles/monitor/tasks/main.yml b/ansible/roles/monitor/tasks/main.yml
index 677db22cb..f00330456 100644
--- a/ansible/roles/monitor/tasks/main.yml
+++ b/ansible/roles/monitor/tasks/main.yml
@@ -1,15 +1,21 @@
 ---
-- name: Copy app secrets
+- name: Copy common secrets
   copy:
-    src: /srv/secrets-newsblur/settings/docker_settings.py
+    src: /srv/secrets-newsblur/settings/common_settings.py
     dest: /srv/newsblur/newsblur_web/local_settings.py
   register: app_changed
 
-- name: Add SERVER_NAME to app secrets
-  lineinfile:
-    path: /srv/newsblur/newsblur_web/local_settings.py
-    line: 'SERVER_NAME = "{{ inventory_hostname }}"'
+- name: Copy app env
+  copy:
+    src: /srv/secrets-newsblur/settings/app_env.py
+    dest: /srv/newsblur/newsblur_web/app_env.py
+  register: app_changed
 
+- name: Add SERVER_NAME to app env
+  lineinfile:
+    path: /srv/newsblur/newsblur_web/app_env.py
+    line: 'SERVER_NAME = "{{ inventory_hostname }}"'
+  
 - name: Start monitor docker container
   become: yes
   docker_container:
diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml
index 9eb222b59..38c522009 100644
--- a/ansible/roles/web/tasks/main.yml
+++ b/ansible/roles/web/tasks/main.yml
@@ -6,15 +6,20 @@
   with_items:
     - "8000"
 
-- name: Copy app secrets
+- name: Copy common secrets
   copy:
-    src: /srv/secrets-newsblur/settings/docker_settings.py
+    src: /srv/secrets-newsblur/settings/common_settings.py
     dest: /srv/newsblur/newsblur_web/local_settings.py
   register: app_changed
 
-- name: Add SERVER_NAME to app secrets
+- name: Copy app env
+  copy:
+    src: /srv/secrets-newsblur/settings/app_env.py
+    dest: /srv/newsblur/newsblur_web/app_env.py
+
+- name: Add SERVER_NAME to app env
   lineinfile:
-    path: /srv/newsblur/newsblur_web/local_settings.py
+    path: /srv/newsblur/newsblur_web/app_env.py
     line: 'SERVER_NAME = "{{ inventory_hostname }}"'
 
 - name: Ensure static dir exists
diff --git a/newsblur_web/docker_local_settings.py b/newsblur_web/docker_local_settings.py
index 563957ae5..cad7ea2f5 100644
--- a/newsblur_web/docker_local_settings.py
+++ b/newsblur_web/docker_local_settings.py
@@ -166,9 +166,9 @@ DO_TOKEN_LOG = '0000000000000000000000000000000000000000000000000000000000000000
 DO_TOKEN_FABRIC = '0000000000000000000000000000000000000000000000000000000000000000'
 
 SERVER_NAME = "nblocalhost"
-NEWSBLUR_URL = os.getenv("https://localhost")
+NEWSBLUR_URL = os.getenv("NEWSBLUR_URL", "https://localhost")
 
-if NEWSBLUR_URL == 'https://localhost':
+if NEWSBLUR_URL == 'https://nb.local.com':
     SESSION_COOKIE_DOMAIN = ".nb.local.com"
 
 SESSION_ENGINE = 'redis_sessions.session'
diff --git a/newsblur_web/settings.py b/newsblur_web/settings.py
index 6d871c194..8a1716590 100644
--- a/newsblur_web/settings.py
+++ b/newsblur_web/settings.py
@@ -558,11 +558,24 @@ S3_AVATARS_BUCKET_NAME = 'avatars.newsblur.com'
 # ==================
 # = Configurations =
 # ==================
+
 if DOCKERBUILD:
     from newsblur_web.docker_local_settings import *
 else:
     from newsblur_web.local_settings import *
 
+try:
+    from newsblur_web.task_env import *
+    print(" ---> Starting NewsBlur task server...")
+except ModuleNotFoundError:
+    pass
+try:
+    from newsblur_web.app_env import *
+    print(" ---> Starting NewsBlur app server...")
+except ModuleNotFoundError:
+    pass
+
+
 if not DEBUG:
     INSTALLED_APPS += (
         'django_ses',