diff --git a/ansible/group_vars/referral.yml b/ansible/group_vars/referral.yml
index 4d0f712..146e9d2 100644
--- a/ansible/group_vars/referral.yml
+++ b/ansible/group_vars/referral.yml
@@ -1,7 +1,7 @@
 ---
 # required service env variables
-referral_srv_google_auth_json: 'TODO'
-referral_srv_apple_secret: 'TODO'
+referral_srv_google_sign_in_client_id: '{{lookup("passwordstore", "service/referral-service/test/google/sign-in-client-id")}}'
+referral_srv_google_sign_in_client_secret: '{{lookup("passwordstore", "service/referral-service/test/google/sign-in-client-secret")}}'
 referral_srv_eth_http_endpoint: '{{lookup("passwordstore", "service/referral-service/test/eth/endpoint")}}'
 referral_srv_eth_contract_address: '{{lookup("passwordstore", "service/referral-service/test/eth/contract-addr")}}'
 referral_srv_eth_contract_name: '{{lookup("passwordstore", "service/referral-service/test/eth/contract-name")}}'
diff --git a/ansible/roles/referral-service/tasks/container.yml b/ansible/roles/referral-service/tasks/container.yml
index 0dceb98..08bdedb 100644
--- a/ansible/roles/referral-service/tasks/container.yml
+++ b/ansible/roles/referral-service/tasks/container.yml
@@ -11,7 +11,7 @@
   docker_compose:
     project_src: '{{ referral_srv_service_path }}'
     state: '{{ compose_state }}'
-    recreate: '{{ compose_recreate }}'
+    recreate: '{{ compose_recreate or app_env.changes or db_env.changed }}'
     restarted: '{{ compose_restart }}'
     pull: false
     build: no
diff --git a/ansible/roles/referral-service/tasks/files.yml b/ansible/roles/referral-service/tasks/files.yml
index 49274ad..c2d3509 100644
--- a/ansible/roles/referral-service/tasks/files.yml
+++ b/ansible/roles/referral-service/tasks/files.yml
@@ -22,10 +22,14 @@
   template:
     src: 'app.env.j2'
     dest: '{{ referral_srv_service_path }}/app.env'
+    group: docker
     mode: 0640
+  register: app_env
 
 - name: Create env file for db
   template:
     src: 'db.env.j2'
     dest: '{{ referral_srv_service_path }}/db.env'
+    group: docker
     mode: 0640
+  register: db_env