diff --git a/docker-compose.yml b/docker-compose.yml
index 1f5f046c3a..6bf5bf89a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,21 +7,9 @@ services:
     image: "deepset/haystack-cpu:latest"
     ports:
       - 8000:8000
-    volumes:
-      # Optional: mount your own models from disk into the container
-      - "./models:/home/user/models"
     environment:
-      # See rest_api/config.py for more variables that you can configure here.
-      - DB_HOST=elasticsearch
-      - USE_GPU=False
-      - TOP_K_PER_SAMPLE=3 # how many answers can come from the same small passage (reduce value for more variety of answers)
-      # Load a model from transformers' model hub or a local path into the FARMReader.
-      - READER_MODEL_PATH=deepset/roberta-base-squad2
-      # - READER_MODEL_PATH=home/user/models/roberta-base-squad2
-      # Alternative: If you want to use the TransformersReader (e.g. for loading a local model in transformers format):
-      # - READER_TYPE=TransformersReader
-      # - READER_MODEL_PATH=/home/user/models/roberta-base-squad2
-      # - READER_TOKENIZER=/home/user/models/roberta-base-squad2
+      # See rest_api/pipelines.yaml for configurations of Search & Indexing Pipeline.
+      - ELASTICSEARCHDOCUMENTSTORE_PARAMS_HOST=elasticsearch
     restart: always
     depends_on:
       - elasticsearch
@@ -36,7 +24,9 @@ services:
     environment:
       - discovery.type=single-node
   ui:
-    image: "deepset/haystack-streamlit-ui"
+    build:
+      context: ui
+      dockerfile: Dockerfile
     ports:
       - 8501:8501
     environment:
diff --git a/rest_api/pipelines.yaml b/rest_api/pipelines.yaml
index d6cb27c51d..b716324eb0 100644
--- a/rest_api/pipelines.yaml
+++ b/rest_api/pipelines.yaml
@@ -3,6 +3,8 @@ version: '0.7'
 components:    # define all the building-blocks for Pipeline
   - name: ElasticsearchDocumentStore
     type: ElasticsearchDocumentStore
+    params:
+      host: localhost
   - name: ESRetriever
     type: ElasticsearchRetriever
     params: