diff --git a/.gitmodules b/.gitmodules
index deebbc02..ea466871 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "docker/wait-for-it/wait-for-it"]
 	path = docker/wait-for-it/wait-for-it
 	url = https://github.com/vishnubob/wait-for-it.git
+[submodule "packages/wait-for-it"]
+	path = packages/wait-for-it
+	url = https://github.com/vishnubob/wait-for-it.git
diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml
index a9bca9e3..2f000764 100644
--- a/docker-compose.accounts.yml
+++ b/docker-compose.accounts.yml
@@ -70,7 +70,7 @@ services:
   kratos-migrate:
     image: oryd/kratos:v0.5.5-alpha.1
     container_name: kratos-migrate
-    restart: off
+    restart: "no"
     logging: *default-logging
     environment:
       - DSN=cockroach://root@cockroach:26257/defaultdb?max_conns=20&max_idle_conns=4&sslmode=verify-full&sslcert=/certs/node.crt&sslkey=/certs/node.key&sslrootcert=/certs/ca.crt
diff --git a/docker-compose.jaeger.yml b/docker-compose.jaeger.yml
index 22ff2fda..3a1c29dc 100644
--- a/docker-compose.jaeger.yml
+++ b/docker-compose.jaeger.yml
@@ -33,7 +33,7 @@ services:
 
   jaeger-collector:
     image: jaegertracing/jaeger-collector
-    command: [ "--es.num-shards=1", "--es.num-replicas=0", "--es.server-urls=http://elasticsearch:9200" ]
+    command: [ "/wait-for-it/wait-for-it.sh", "elasticsearch:9200", "--", "--es.num-shards=1", "--es.num-replicas=0", "--es.server-urls=http://elasticsearch:9200" ]
     container_name: jaeger-collector
     restart: on-failure
     expose:
@@ -43,15 +43,17 @@ services:
     environment:
       - SPAN_STORAGE_TYPE=elasticsearch
       - LOG_LEVEL=debug
+    volumes:
+      - ./packages/wait-for-it:/wait-for-it
     networks:
       shared:
         ipv4_address: 10.10.10.91
     depends_on:
-      - wait-for-it
+      - elasticsearch
 
   jaeger-query:
     image: jaegertracing/jaeger-query
-    command: [ "--es.num-shards=1", "--es.num-replicas=0", "--es.server-urls=http://elasticsearch:9200" ]
+    command: [ "/wait-for-it/wait-for-it.sh", "elasticsearch:9200", "--", "--es.num-shards=1", "--es.num-replicas=0", "--es.server-urls=http://elasticsearch:9200" ]
     container_name: jaeger-query
     restart: on-failure
     ports:
@@ -61,22 +63,13 @@ services:
     environment:
       - SPAN_STORAGE_TYPE=elasticsearch
       - LOG_LEVEL=debug
+    volumes:
+      - ./packages/wait-for-it:/wait-for-it
     networks:
       shared:
         ipv4_address: 10.10.10.92
     depends_on:
-      - wait-for-it
-
-  wait-for-it:
-    build:
-      context: ./docker/wait-for-it
-      dockerfile: Dockerfile
-    command: [ "./wait-for-it.sh", "localhost:9200" ]
-    container_name: wait-for-it
-    restart: on-failure
-    networks:
-      shared:
-        ipv4_address: 10.10.10.95
+      - elasticsearch
 
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.15
diff --git a/docker/wait-for-it/Dockerfile b/docker/wait-for-it/Dockerfile
deleted file mode 100644
index f1d23e1f..00000000
--- a/docker/wait-for-it/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM bash:5
-
-COPY wait-for-it/wait-for-it.sh ./
diff --git a/docker/wait-for-it/wait-for-it b/packages/wait-for-it
similarity index 100%
rename from docker/wait-for-it/wait-for-it
rename to packages/wait-for-it