diff --git a/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/docker-compose.yml b/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/docker-compose.yml
index bd668a05d8..96b03cbb07 100644
--- a/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/docker-compose.yml
+++ b/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/docker-compose.yml
@@ -14,6 +14,8 @@ services:
 
   elasticsearch:
     image: fundocker/openshift-elasticsearch:6.6.2
+    environment:
+      - discovery.type=single-node
     env_file:
       - "env.d/development"
     ports:
@@ -98,18 +100,17 @@ services:
   node:
     image: node:16.15
     working_dir: /app/src/frontend
-    user: "${DOCKER_USER:-1000}"
+    user: ${DOCKER_USER:-1000}
     volumes:
       - ./sites/${RICHIE_SITE:-funmooc}:/app
 
   terraform-state:
     image: hashicorp/terraform:latest
     env_file: env.d/aws
-    user: "${DOCKER_USER:-1000}"
+    user: ${DOCKER_USER:-1000}
     working_dir: /app
     volumes:
       - ./aws/create_state_bucket:/app
-    user: ${DOCKER_USER:-1000}
 
   terraform:
     image: hashicorp/terraform:0.12.31
@@ -117,12 +118,11 @@ services:
       - TF_VAR_SITE=${RICHIE_SITE:-funmooc}
       - TF_DATA_DIR=/config
     env_file: env.d/aws
-    user: "${DOCKER_USER:-1000}"
+    user: ${DOCKER_USER:-1000}
     working_dir: /app
     volumes:
       - ./aws:/app
       - ./sites/${RICHIE_SITE:-funmooc}/aws:/config
-    user: ${DOCKER_USER:-1000}
 
   redis-sentinel:
     image: docker.io/bitnami/redis-sentinel:6.0-debian-10
diff --git a/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/env.d/development b/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/env.d/development
index 77c21503ba..351a0695e7 100644
--- a/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/env.d/development
+++ b/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/env.d/development
@@ -7,7 +7,6 @@ DJANGO_ALLOWED_HOSTS=*
 
 # Elastic search
 RICHIE_ES_HOST=elasticsearch
-discovery.type=single-node
 
 # PostgreSQL db container configuration
 POSTGRES_DB=richie