diff --git a/apps/dgraph/install.sh b/apps/dgraph/install.sh
index 0e6e448..824ce4a 100755
--- a/apps/dgraph/install.sh
+++ b/apps/dgraph/install.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-kubectl create namespace dgraph
 helm repo add dgraph https://charts.dgraph.io
-helm --namespace=dgraph install init dgraph/dgraph \
+helm --namespace=dgraph install --create-namespace init dgraph/dgraph \
      --set fullnameOverride=dgraph \
      --set image.repository=dgraph/dgraph \
      --set image.tag=latest \
@@ -16,6 +15,7 @@
      --set alpha.configFile."config\.yaml"="whitelist: '0.0.0.0:255.255.255.255'"
 
 echo "Waiting for dgraph-alpha to start"
-kubectl -n dgraph wait --for=condition=Ready pod/dgraph-alpha-0
+sleep 2
+kubectl -n dgraph wait --timeout=-1s --for=condition=Ready pod/dgraph-alpha-0
 echo "Waiting for dgraph-zero to start"
-kubectl -n dgraph wait --for=condition=Ready pod/dgraph-zero-0
+kubectl -n dgraph wait --timeout=-1s --for=condition=Ready pod/dgraph-zero-0
diff --git a/controller/bootstrap-schema.sh b/controller/bootstrap-schema.sh
deleted file mode 100644
index d258fe1..0000000
--- a/controller/bootstrap-schema.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# set -e
-
-# trap "exit" INT TERM ERR
-# trap "kill 0" EXIT
-
-kubectl -n dgraph port-forward svc/dgraph-alpha 8080 &
-sleep 1
-curl -X POST http://localhost:8080/admin/schema -d 'enum EventState { NEW PROCESSING DONE } type Ignore { x: Int }'
diff --git a/dev/bootstrap_schema.sh b/dev/bootstrap_schema.sh
new file mode 100644
index 0000000..095669e
--- /dev/null
+++ b/dev/bootstrap_schema.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+kubectl -n dgraph port-forward svc/dgraph-alpha 8081:8080 &
+sleep 1
+curl -X POST http://localhost:8081/admin/schema -d 'enum EventState { NEW PROCESSING DONE } type Ignore { x: Int }'
diff --git a/dev/create_dev_cluster.sh b/dev/create_dev_cluster.sh
index e407591..e6b01e1 100755
--- a/dev/create_dev_cluster.sh
+++ b/dev/create_dev_cluster.sh
@@ -22,3 +22,6 @@
 ##  docker build --tag=localhost:30500/foo/bar:latest .
 ##  docker push pcloud-localhost:30500/foo/bar:latest
 kubectl apply -f $ROOT/apps/container-registry/install.yaml
+echo "Waiting for Container Registry to start"
+sleep 2
+kubectl -n container-registry wait --timeout=-1s --for=condition=Ready pod/registry-0
diff --git a/dev/install_core_services.sh b/dev/install_core_services.sh
index 28d66f8..d4ba265 100755
--- a/dev/install_core_services.sh
+++ b/dev/install_core_services.sh
@@ -4,6 +4,7 @@
 
 # Dgraph
 source $ROOT/apps/dgraph/install.sh
+source $ROOT/dev/bootstrap_schema.sh
 
 # Knowledge Graph
 bazel run //controller:push_to_dev