diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
index 9a2a370..549f28b 100644
--- a/.github/workflows/test-docker.yml
+++ b/.github/workflows/test-docker.yml
@@ -19,6 +19,9 @@ jobs:
         working-directory: docker/tests
         run: |
           docker compose build
+          # make sure data directory exists has correct permissions
+          mkdir ./data
+          sudo chown -R "$(id -g)":"$(id -u)" ./data
       - name: Run containers
         working-directory: docker/tests
         run: |
@@ -26,8 +29,6 @@ jobs:
       - name: Run CLI tests
         working-directory: docker/tests
         run: |
-          # make sure data directory has correct permissions
-          sudo chown -R 1001:1001 ./data
           # test adding a subscription
           docker exec subscriber  bash -c "source /home/wis2downloader/.venv/bin/activate && wis2downloader add-subscription --topic cache/a/wis2/+/services/#" 
           # test listing subscriptions
diff --git a/docker/tests/docker-compose.yml b/docker/tests/docker-compose.yml
index 50f915c..e044907 100644
--- a/docker/tests/docker-compose.yml
+++ b/docker/tests/docker-compose.yml
@@ -33,4 +33,4 @@ services:
         - broker
       volumes:
         - ./data:/home/wis2downloader/app/data/downloads
-      user: 1001:1001
+      user: $GID:$UID