diff --git a/.tasks/docker-darwin.yaml b/.tasks/docker-darwin.yaml
index c99dfc1f5..bc8d0504e 100644
--- a/.tasks/docker-darwin.yaml
+++ b/.tasks/docker-darwin.yaml
@@ -23,24 +23,29 @@ tasks:
   build:
     desc: Build the app and the corresponding Docker image (tagged as "miw-test")
     cmds:
-      - task: :build-app
+      - task: :app:build
       - docker build -t local-miw --platform linux/amd64 .
 
   start-middleware:
     desc: Spin up local Docker environment
-    dir: dev-assets/dev-containers
+    dir: dev-assets/docker-environment
     ignore_error: true
     vars:
       OPTIONS: '{{ default "" .OPTIONS }}'
-      CONTAINERS: '{{ default "local_postgres local_keycloak" .CONTAINERS }}'
+      CONTAINERS: '{{ default "postgres keycloak" .CONTAINERS }}'
     cmds:
+      - cat postgres/db.sh.tpl | envsubst > postgres/db.sh
+      - chmod +x postgres/db.sh
       - "docker-compose up {{ .OPTIONS }} {{ .CONTAINERS }}"
 
   stop-middleware:
     desc: Stop local Docker environment
-    dir: dev-assets/dev-containers
+    dir: dev-assets/docker-environment
     cmds:
       - docker-compose down
+      - cmd: docker volume remove docker-environment_postgres_data
+        ignore_error: true
+      - rm -f postgres/db.sh
 
   start-app:
     desc: Run the app in a container environment (including middleware aka Postgresql and Keycloak)
@@ -53,12 +58,12 @@ tasks:
         ignore_error: true
       - task: start-middleware
         vars:
-          CONTAINERS: "local_miw_app"
+          CONTAINERS: "miw"
 
   stop-app:
     desc: Stop all running containers
     cmds:
-      - docker stop local_miw_app
+      - docker stop miw
       - task: stop-middleware
 
   cleanup: