diff --git a/drupal-stack.yaml b/drupal-stack.yaml
index 5971d3e88f98..e7c51adde912 100644
--- a/drupal-stack.yaml
+++ b/drupal-stack.yaml
@@ -2,7 +2,7 @@ namespace: drupal
 
 stack-db:
   defines: runnable
-  inherits: postgresql/db
+  inherits: postgresql/db-v17
   metadata:
     name: Drupal Stack PostgreSQL
     description: |
@@ -35,10 +35,6 @@ stack-db:
       env: POSTGRES_PASSWORD
       value: <- $stack-db-password
       description: Sensitive PostgreSQL password shared with Drupal. Production deployments should set secret("drupal-db-password").
-  containers:
-    postgres:
-      paths:
-        - <- `${volume-path}/drupal-stack-postgres:/var/lib/postgresql/data`
   files:
     drupal-postgres-init:
       container: postgres
@@ -123,17 +119,17 @@ stack-app:
       type: string
       value: <- $stack-public-url
       description: Public URL expected for Drupal when routed through Monk ingress.
-    files-volume-name:
-      type: string
-      value: drupal-stack-files
-      description: Monk volume subdirectory used for production Drupal files.
   containers:
     drupal:
       image: drupal
       image-tag: <- $drupal-image-tag
       restart: unless-stopped
-      paths:
-        - <- `${volume-path}/${files-volume-name}:/opt/drupal/web/sites/default/files`
+      mounted-volumes:
+        files:
+          path: /opt/drupal/web/sites/default/files
+  volumes:
+    files:
+      kind: local
   services:
     http:
       container: drupal
@@ -238,10 +234,6 @@ stack-local-db:
       env: POSTGRES_PASSWORD
       value: <- $stack-local-db-password
       description: Sensitive generated PostgreSQL password for local verification.
-  containers:
-    postgres:
-      paths:
-        - <- `${volume-path}/drupal-stack-local-postgres:/var/lib/postgresql/data`
   checks:
     readiness:
       code: tcp-check-service("drupal/stack-local-db", "postgres")
@@ -304,10 +296,6 @@ stack-local-app:
       type: string
       value: http://localhost:18081
       description: Local URL used for external HTTP verification.
-    files-volume-name:
-      type: string
-      value: drupal-stack-local-files
-      description: Monk volume subdirectory used for local Drupal files.
     drupal-image-tag:
       type: string
       value: 11-apache
@@ -325,8 +313,12 @@ stack-local-app:
       image: drupal
       image-tag: <- $drupal-image-tag
       restart: unless-stopped
-      paths:
-        - <- `${volume-path}/${files-volume-name}:/opt/drupal/web/sites/default/files`
+      mounted-volumes:
+        files:
+          path: /opt/drupal/web/sites/default/files
+  volumes:
+    files:
+      kind: local
   services:
     http:
       container: drupal
diff --git a/drupal.yaml b/drupal.yaml
index aef566ccad39..7df8b3ef745b 100644
--- a/drupal.yaml
+++ b/drupal.yaml
@@ -70,17 +70,17 @@ base:
       type: string
       value: https://drupal.example.com
       description: Public base URL expected for the Drupal site when exposed through ingress.
-    files-volume-name:
-      type: string
-      value: drupal-files
-      description: Monk volume subdirectory used for Drupal uploaded files and generated assets.
   containers:
     drupal:
       image: drupal
       image-tag: <- $drupal-image-tag
       restart: unless-stopped
-      paths:
-        - <- `${volume-path}/${files-volume-name}:/opt/drupal/web/sites/default/files`
+      mounted-volumes:
+        files:
+          path: /opt/drupal/web/sites/default/files
+  volumes:
+    files:
+      kind: local
   files:
     settings-php:
       container: drupal