diff --git a/commands b/commands
index 67f6543..df864b3 100755
--- a/commands
+++ b/commands
@@ -36,17 +36,11 @@ case "$1" in
     echo "$ID" > "$SERVICE_ROOT/ID"
 
     dokku_log_verbose_quiet "Waiting for container to be ready"
-    sleep 10
+    docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" aanand/wait > /dev/null
 
     dokku_log_verbose_quiet "Creating container database"
-    IP=$(get_container_ip "$ID")
-    DATABASE_NAME="$(get_database_name $SERVICE)"
-    while true; do
-      PGPASSWORD=$password psql --quiet -h "$IP" -p 5432 -U postgres --command "CREATE DATABASE $DATABASE_NAME;" &>/dev/null || {
-        continue
-      }
-      break
-    done
+    DATABASE_NAME="$(get_database_name "$SERVICE")"
+    docker exec "$SERVICE_NAME" su - postgres -c "createdb -E utf8 $DATABASE_NAME"
 
     dokku_log_info2 "$PLUGIN_SERVICE container created: $SERVICE"
     dokku "$PLUGIN_COMMAND_PREFIX:info" "$SERVICE"
@@ -78,8 +72,6 @@ case "$1" in
       ID=$(cat "$SERVICE_ROOT/ID")
 
       service_stop "$SERVICE"
-      dokku_log_verbose_quiet "Killing container"
-      docker kill "$ID" > /dev/null || true
       sleep 1
 
       dokku_log_verbose_quiet "Removing container"
diff --git a/install b/install
index a32d3b8..51c0387 100755
--- a/install
+++ b/install
@@ -7,6 +7,7 @@ if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q "$PLUGIN_IMAGE_VERSION"
 fi
 
 docker pull svendowideit/ambassador:latest
+docker pull aanand/wait:latest
 
 mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE directory"
 chown dokku:dokku "$PLUGIN_DATA_ROOT"