diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 0153d18..c1d6303 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -88,8 +88,7 @@ jobs:
 
       - name: Start demo
         run: |
-          export UID=${UID}
-          export GID=${GID}
+          export DOCKER_USER="${UID}:${GID}"
 
           just start -d
           timeout 10 docker compose logs -f -n 100 ||:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ab07ca8..a4f858b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -4,8 +4,7 @@ services:
       dockerfile: Dockerfile
       context: .
     restart: always
-    # user: "${DOCKER_USER}"
-    user: "${UID}:${GID}"
+    user: "${DOCKER_USER:-tedge:tedge}"
     secrets:
       - source: certificate_private_key
         mode: 0644