diff --git a/commands b/commands
index c2f2048..94cee7b 100755
--- a/commands
+++ b/commands
@@ -46,7 +46,7 @@ case "$1" in
     echo "$ID" > "$SERVICE_ROOT/ID"
 
     dokku_log_verbose_quiet "Waiting for container to be ready"
-    docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" aanand/wait > /dev/null
+    docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" dokkupaas/wait > /dev/null
 
     echo "db.createUser({user:'admin',pwd:'$rootpassword',roles:[{role:'userAdminAnyDatabase',db:'admin'}]})" | docker exec -i "$SERVICE_NAME" mongo admin > /dev/null
     echo "db.createUser({user:'$SERVICE',pwd:'$password',roles:[{role:'readWrite',db:'$SERVICE'}]})" | docker exec -i "$SERVICE_NAME" mongo -u admin -p "$rootpassword" --authenticationDatabase admin "$SERVICE" > /dev/null
diff --git a/install b/install
index 763af9b..ee439da 100755
--- a/install
+++ b/install
@@ -10,8 +10,8 @@ if ! docker images | grep -e "^svendowideit/ambassador "; then
   docker pull svendowideit/ambassador:latest
 fi
 
-if ! docker images | grep -e "^aanand/wait "; then
-  docker pull aanand/wait:latest
+if ! docker images | grep -e "^dokkupaas/wait "; then
+  docker pull dokkupaas/wait:latest
 fi
 
 mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE directory"