diff --git a/config/search/update-handler.store b/config/search/update-handler.store
new file mode 100644
index 0000000..90757d3
--- /dev/null
+++ b/config/search/update-handler.store
@@ -0,0 +1,3 @@
+---
+queue: []
+index: {}
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 4c25a54..5666a47 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -44,3 +44,19 @@ services:
     restart: "no"
   uri-info:
     restart: "no"
+  delta-producer-bg-jobs-initiator-administrative-units:
+    restart: "no"
+  delta-producer-pub-graph-maintainer-administrative-units:
+    restart: "no"
+  delta-producer-json-diff-publisher-administrative-units:
+    restart: "no"
+  delta-producer-bg-jobs-initiator-organizations:
+    restart: "no"
+  delta-producer-pub-graph-maintainer-organizations:
+    restart: "no"
+  delta-producer-json-diff-publisher-organizations:
+    restart: "no"
+  search:
+    restart: "no"
+  elasticsearch:
+    restart: "no"
diff --git a/docker-compose.yml b/docker-compose.yml
index 0f20a7a..79a9974 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -341,6 +341,7 @@ services:
       image: nbittich/mu-search:wip
       links:
         - db:database
+      restart: always
       volumes:
         - ./config/search:/config
   elasticsearch:
@@ -348,4 +349,6 @@ services:
     volumes:
       - ./data/elasticsearch/:/usr/share/elasticsearch/data
     environment:
-      - discovery.type=single-node 
\ No newline at end of file
+      - discovery.type=single-node 
+    restart: always
+    
\ No newline at end of file