diff --git a/Dockerfile b/Dockerfile
index bbd9634204..e81d363ee8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ushahidi/php-fpm-nginx:php-5.6
+FROM ushahidi/php-fpm-nginx:php-7.0
 
 WORKDIR /var/www
 COPY composer.json ./
 COPY composer.lock ./
-RUN composer install --no-autoloader
+RUN composer install --no-autoloader --no-scripts
 
 COPY . .
 RUN chgrp -R 0 . && chmod -R g+rwX . && \
 	usermod -g 0 www-data && \
-	chmod 777 application/cache application/media/uploads application/logs
+	chmod 777 storage
 
 COPY docker/common.sh /common.sh
 COPY docker/run.tasks.conf /etc/chaperone.d/
diff --git a/docker/common.sh b/docker/common.sh
index 0cadb2994c..52bb573b7e 100644
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -9,12 +9,12 @@ check_vols_src() {
 }
 
 check_migrations_pending() {
-  local n_pending=$(./bin/phinx status --no-ansi -c application/phinx.php | grep -E '^[[:space:]]+down[[:space:]]+' | wc -l)
+  local n_pending=$(./bin/phinx status --no-ansi -c phinx.php | grep -E '^[[:space:]]+down[[:space:]]+' | wc -l)
   [ $n_pending -gt 0 ]
 }
 
 run_migrations() {
-  ./bin/phinx migrate -c application/phinx.php
+  composer migrate
 }
 
 function sync {
diff --git a/docker/run.tasks.conf b/docker/run.tasks.conf
index 17758a5912..0989113d02 100644
--- a/docker/run.tasks.conf
+++ b/docker/run.tasks.conf
@@ -1,7 +1,7 @@
 platform.dataprovider.outgoing.service: {
 	type: cron,
 	directory: "/var/www",
-	command: "bin/ushahidi dataprovider outgoing",
+	command: "artisan dataprovider:outgoing",
 	interval: "* * * * */5",
 	enabled: "$(ENABLE_PLATFORM_TASKS:-false)"
 }
@@ -9,7 +9,7 @@ platform.dataprovider.outgoing.service: {
 platform.dataprovider.incoming.service: {
 	type: cron,
 	directory: "/var/www",
-	command: "bin/ushahidi dataprovider incoming",
+	command: "artisan dataprovider:incoming",
 	interval: "* * * * */5",
 	enabled: "$(ENABLE_PLATFORM_TASKS:-false)"
 }
@@ -17,15 +17,15 @@ platform.dataprovider.incoming.service: {
 platform.savedsearch.service: {
 	type: cron,
 	directory: "/var/www",
-	command: "bin/ushahidi savedsearch",
+	command: "artisan savedsearch:sync",
 	interval: "* * * * */5",
 	enabled: "$(ENABLE_PLATFORM_TASKS:-false)"
 }
 
 platform.notification.queue.service: {
 	type: cron,
-	directory: "/var/www", 
-	command: "bin/ushahidi queue service",
+	directory: "/var/www",
+	command: "artisan notification:queue",
 	interval: "* * * * */5",
 	enabled: "$(ENABLE_PLATFORM_TASKS:-false)"
 }
@@ -33,7 +33,7 @@ platform.notification.queue.service: {
 platform.webhook.send.service: {
 	type: cron,
 	directory: "/var/www",
-	command: "bin/ushahidi webhook send",
+	command: "artisan webhook:send",
 	interval: "* * * * */5",
 	enabled: "$(ENABLE_PLATFORM_TASKS:-false)"
 }
diff --git a/docker/test.Dockerfile b/docker/test.Dockerfile
index 6270c1932b..ba27ea8ac0 100644
--- a/docker/test.Dockerfile
+++ b/docker/test.Dockerfile
@@ -1,4 +1,4 @@
-FROM ushahidi/php-ci:php-7.0.28
+FROM ushahidi/php-ci:php-7.0
 
 WORKDIR /var/www
 COPY composer.json ./