diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 6bbde16..7ccb46c 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -56,12 +56,17 @@ services:
         else
           papercrate-admin create-tenant admin;
         fi &&
+        ADMIN_TENANT_ID=$(papercrate-admin list-tenants | awk '/^admin / {print $2; exit}') &&
+        if [ -z "$ADMIN_TENANT_ID" ]; then
+          echo 'failed to resolve admin tenant id' >&2;
+          exit 1;
+        fi &&
         echo 'Ensuring demo user credentials' &&
         (papercrate-admin create-user admin adminadmin || papercrate-admin set-password admin adminadmin) &&
         echo 'Ensuring demo membership' &&
-        papercrate-admin add-user-to-tenant admin admin admin &&
+        papercrate-admin add-user-to-tenant admin "$ADMIN_TENANT_ID" &&
         echo 'Ensuring Quickwit index for admin tenant' &&
-        papercrate-admin quickwit-create-index admin
+        papercrate-admin quickwit-create-index "$ADMIN_TENANT_ID"
       "
     user: root
     restart: "no"
diff --git a/docker-compose.yml b/docker-compose.yml
index 9b2d399..5bb19cf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -91,12 +91,17 @@ services:
         else
           papercrate-admin create-tenant admin;
         fi &&
+        ADMIN_TENANT_ID=$(papercrate-admin list-tenants | awk '/^admin / {print $2; exit}') &&
+        if [ -z "$ADMIN_TENANT_ID" ]; then
+          echo 'failed to resolve admin tenant id' >&2;
+          exit 1;
+        fi &&
         echo 'Ensuring demo user credentials' &&
         (papercrate-admin create-user admin adminadmin || papercrate-admin set-password admin adminadmin) &&
         echo 'Ensuring demo membership' &&
-        papercrate-admin add-user-to-tenant admin admin admin &&
+        papercrate-admin add-user-to-tenant admin "$ADMIN_TENANT_ID" &&
         echo 'Ensuring Quickwit index for admin tenant' &&
-        papercrate-admin quickwit-create-index admin
+        papercrate-admin quickwit-create-index "$ADMIN_TENANT_ID"
       "
     user: root
     restart: "no"