diff --git a/compose.yaml b/compose.yaml
index 6e14cea..adff419 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -16,7 +16,7 @@
     command: super_client_info kalamar /kalamar/data/super_client_info
     volumes:
       - type: bind
-        source: "${PWD}"
+        source: "${PWD}/data/"
         target: "/kalamar/data"
     profiles:
       - full
@@ -31,10 +31,10 @@
       KALAMAR_API: "http://kustvakt-full:8089/api/"
     volumes:
       - type: bind
-        source: "${PWD}/kalamar.production.conf"
+        source: "${PWD}/data/kalamar.production.conf"
         target: "/kalamar/kalamar.production.conf"
       - type: bind
-        source: "${PWD}/super_client_info"
+        source: "${PWD}/data/super_client_info"
         target: /kalamar/super_client_info
     depends_on:
       kustvakt-full:
@@ -44,6 +44,7 @@
     profiles:
       - full
     restart: "unless-stopped"
+    user: root
   kustvakt:
     image: "korap/kustvakt:latest"
     expose:
@@ -57,11 +58,12 @@
     image: "korap/kustvakt:latest-full"
     expose:
       - 8089
+    user: root
     volumes:
       - "${INDEX}:/kustvakt/index:z"
       - type: bind
-        source: "${PWD}/super_client_info"
-        target: /kustvakt/client/super_client_info
+        source: "${PWD}/data/"
+        target: /kustvakt/data/
     profiles:
       - full
     depends_on: