diff --git a/roles/lokole/defaults/main.yml b/roles/lokole/defaults/main.yml
index 0045b8aad..b8f4d030f 100644
--- a/roles/lokole/defaults/main.yml
+++ b/roles/lokole/defaults/main.yml
@@ -29,6 +29,7 @@ lokole_uid: "2000"
 lokole_home_dir: /home/{{ lokole_user }}
 lokole_run_dir: "{{ lokole_home_dir }}/state"
 lokole_log_dir: "{{ lokole_home_dir }}/logs"
+lokole_settings: "{{ lokole_run_dir }}/settings.env"
 lokole_domain_socket: "{{ lokole_run_dir }}/lokole_gunicorn.sock"
 lokole_sim_type: LocalOnly
 
diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml
index 8b651e021..e7072c62d 100644
--- a/roles/lokole/tasks/install.yml
+++ b/roles/lokole/tasks/install.yml
@@ -104,13 +104,13 @@
     owner: "{{ lokole_user }}"
     mode: g+rw
 
-- name: Install {{ lokole_run_dir }}/settings.env
+- name: Install {{ lokole_settings }}
   template:
     src: settings.env.j2
-    dest: "{{ lokole_run_dir }}/settings.env"
+    dest: "{{ lokole_settings }}"
     group: "{{ lokole_user }}"
     owner: "{{ lokole_user }}"
-    mode: a+rw
+    mode: g+rw
 
 - name: Install {{ lokole_confd }} templates to configure Lokole
   template:
diff --git a/roles/lokole/tasks/main.yml b/roles/lokole/tasks/main.yml
index d1955d82c..396fb77bf 100644
--- a/roles/lokole/tasks/main.yml
+++ b/roles/lokole/tasks/main.yml
@@ -69,8 +69,8 @@
       value: "{{ lokole_install }}"
     - option: lokole_enabled
       value: "{{ lokole_enabled }}"
-    - option: lokole_run_directory
-      value: "{{ lokole_run_directory }}"
+    - option: lokole_settings
+      value: "{{ lokole_settings }}"
     - option: lokole_url
       value: "{{ lokole_url }}"
     - option: lokole_full_url
diff --git a/roles/lokole/templates/lokole_celery_beat.conf b/roles/lokole/templates/lokole_celery_beat.conf
index 517055c32..b751b3453 100644
--- a/roles/lokole/templates/lokole_celery_beat.conf
+++ b/roles/lokole/templates/lokole_celery_beat.conf
@@ -1,5 +1,5 @@
 [program:lokole_celery_beat]
-command="{{ lokole_venv }}/bin/celery" --app=opwen_email_client.webapp.tasks beat --pidfile="{{ lokole_run_dir }}/lokole_celery_beat.pid" --loglevel=error
+command={{ lokole_venv }}/bin/celery --app=opwen_email_client.webapp.tasks beat --pidfile={{ lokole_run_dir }}/lokole_celery_beat.pid --loglevel=error
 autostart=true
 autorestart=true
 startretries=3
@@ -7,4 +7,4 @@ stopasgroup=true
 stderr_logfile={{ lokole_log_dir }}/lokole_celery_beat.stderr.log
 stdout_logfile={{ lokole_log_dir }}/lokole_celery_beat.stdout.log
 user={{ lokole_user }}
-environment=OPWEN_SETTINGS={{ lokole_run_dir }}/settings.env
+environment=OPWEN_SETTINGS={{ lokole_settings }}
diff --git a/roles/lokole/templates/lokole_celery_worker.conf b/roles/lokole/templates/lokole_celery_worker.conf
index 85eb61ee0..5f25258fd 100644
--- a/roles/lokole/templates/lokole_celery_worker.conf
+++ b/roles/lokole/templates/lokole_celery_worker.conf
@@ -1,10 +1,10 @@
 [program:lokole_celery_worker]
-command="{{ lokole_venv }}/bin/celery" --app=opwen_email_client.webapp.tasks worker --loglevel=error --concurrency=2
+command={{ lokole_venv }}/bin/celery --app=opwen_email_client.webapp.tasks worker --loglevel=error --concurrency=2
 autostart=true
 autorestart=true
 startretries=3
 stopasgroup=true
 stderr_logfile={{ lokole_log_dir }}/lokole_celery_worker.stderr.log
 stdout_logfile={{ lokole_log_dir }}/lokole_celery_worker.stdout.log
-user="{{ lokole_user }}"
-environment=OPWEN_SETTINGS={{ lokole_run_dir }}/settings.env
+user={{ lokole_user }}
+environment=OPWEN_SETTINGS={{ lokole_settings }}
diff --git a/roles/lokole/templates/lokole_gunicorn.conf b/roles/lokole/templates/lokole_gunicorn.conf
index 9d927ae30..a2a940ed4 100644
--- a/roles/lokole/templates/lokole_gunicorn.conf
+++ b/roles/lokole/templates/lokole_gunicorn.conf
@@ -1,5 +1,5 @@
 [program:lokole_gunicorn]
-command="{{ lokole_venv }}/bin/gunicorn" --bind="unix:{{ lokole_run_dir }}/lokole_gunicorn.sock" --timeout=300 --workers=3 --log-level=error opwen_email_client.webapp:app
+command={{ lokole_venv }}/bin/gunicorn --bind=unix:{{ lokole_run_dir }}/lokole_gunicorn.sock --timeout=300 --workers=3 --log-level=error opwen_email_client.webapp:app
 autostart=true
 autorestart=true
 startretries=3
@@ -7,4 +7,4 @@ stopasgroup=true
 stderr_logfile={{ lokole_log_dir }}/lokole_gunicorn.stderr.log
 stdout_logfile={{ lokole_log_dir }}/lokole_gunicorn.stdout.log
 user={{ lokole_user }}
-environment=OPWEN_SETTINGS={{ lokole_run_dir }}/settings.env
+environment=OPWEN_SETTINGS={{ lokole_settings }}
diff --git a/roles/lokole/templates/lokole_restarter.conf b/roles/lokole/templates/lokole_restarter.conf
index a17133113..9ecc43202 100644
--- a/roles/lokole/templates/lokole_restarter.conf
+++ b/roles/lokole/templates/lokole_restarter.conf
@@ -1,10 +1,10 @@
 [program:lokole_restarter]
-command="{{ lokole_venv }}/bin/manage.py" restarter --directory="{{ lokole_run_dir }}/lokole_restarter"
+command={{ lokole_venv }}/bin/manage.py restarter --directory={{ lokole_run_dir }}/lokole_restarter
 autostart=true
 autorestart=true
 startretries=3
 stopasgroup=true
 stderr_logfile={{ lokole_log_dir }}/lokole_restarter.stderr.log
 stdout_logfile={{ lokole_log_dir }}/lokole_restarter.stdout.log
-user=root
-environment=
+user={{ lokole_user }}
+environment=OPWEN_SETTINGS={{ lokole_settings }}
diff --git a/roles/lokole/templates/settings.env.j2 b/roles/lokole/templates/settings.env.j2
index e1d15bdfc..c4b0ccdf7 100644
--- a/roles/lokole/templates/settings.env.j2
+++ b/roles/lokole/templates/settings.env.j2
@@ -1,8 +1,9 @@
-OPWEN_SETTINGS='{{ lokole_run_directory }}/settings.env'
-OPWEN_STATE_DIRECTORY='{{ lokole_run_directory }}'
-OPWEN_APP_ROOT='{{ lokole_url }}/'
+OPWEN_SETTINGS={{ lokole_run_dir }}/settings.env
+OPWEN_STATE_DIRECTORY={{ lokole_run_dir }}
+OPWEN_APP_ROOT={{ lokole_url }}/
 OPWEN_MAX_UPLOAD_SIZE_MB=10
-OPWEN_SYNC_SCHEDULE='1,16,31,46 * * * *'
-OPWEN_SESSION_KEY='{{ lookup('password', '/dev/null chars=ascii_letters,digits,_ length=32') }}'
-OPWEN_PASSWORD_SALT='{{ lookup('password', '/dev/null chars=ascii_letters,digits,_ length=16') }}'
-OPWEN_SIM_TYPE='{{ lokole_sim_type }}'
+OPWEN_SYNC_SCHEDULE="1,16,31,46 * * * *"
+OPWEN_RESTART_PATH={{ lokole_run_dir }}/lokole_restarter/lokole_gunicorn=HUP,{{ lokole_run_dir }}/lokole_restarter/lokole_celery_worker=,{{ lokole_run_dir }}/lokole_restarter/lokole_celery_beat=
+OPWEN_SECRET_KEY={{ lookup('password', '/dev/null chars=ascii_letters,digits,_ length=32') }}
+OPWEN_PASSWORD_SALT={{ lookup('password', '/dev/null chars=ascii_letters,digits,_ length=16') }}
+OPWEN_SIM_TYPE={{ lokole_sim_type }}