diff --git a/docker-compose.yml b/docker-compose.yml
index 6b40c33..b084cea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,12 +2,17 @@ version: '3'
 services:
     app:
         build:
-            context: ./docker
-            dockerfile: Dockerfile-app
+            context: .
+            dockerfile: docker/Dockerfile
+            target: mapg_dev
+        depends_on:
+            mariadb:
+                condition: service_healthy
         ports:
             - 80:80
         volumes:
             - .:/var/www/rvr
+        working_dir: /var/www/rvr
     mariadb:
         image: mariadb:10.3
         ports:
@@ -19,6 +24,13 @@ services:
             MYSQL_DATABASE: 'rvr'
             MYSQL_USER: 'rvr'
             MYSQL_PASSWORD: 'rvr'
+        healthcheck:
+            test: ["CMD-SHELL", "mysqladmin -u $$MYSQL_USER -p$$MYSQL_PASSWORD ping -h localhost || exit 1"]
+            start_period: 5s
+            start_interval: 1s
+            interval: 5s
+            timeout: 5s
+            retries: 5
     adminer:
         image: adminer:4.8.1-standalone
         ports: