diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9d1d7bd5..2f1b87c1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,15 +55,14 @@ jobs:
       - name: Test and lint dev OWS image
         run: |
           mkdir artifacts
-          chmod 777 artifacts
-          docker run -e LOCAL_UID=1000 -e LOCAL_GID=1000 -u ubuntu -v ${PWD}/artifacts:/mnt/artifacts ${ORG}/${IMAGE}:_builder /bin/sh -c "cd /code && ./check-code.sh"
+          docker run -e LOCAL_UID=$(id -u $USER) -e LOCAL_GID=$(id -g $USER) -v ${PWD}/artifacts:/mnt/artifacts ${ORG}/${IMAGE}:_builder /bin/sh -c "cd /code && ./check-code.sh"
           mv ./artifacts/coverage.xml ./artifacts/coverage-unit.xml
 
       - name: Dockerized Integration Pytest
         run: |
           export $(grep -v '^#' .env_simple | xargs)
           docker compose -f docker-compose.yaml -f docker-compose.db.yaml up -d --wait --build
-          docker compose -f docker-compose.yaml -f docker-compose.db.yaml exec -u ubuntu -T ows /bin/sh -c "cd /code && ./check-code-all.sh"
+          docker compose -f docker-compose.yaml -f docker-compose.db.yaml exec -T ows /bin/sh -c "cd /code && ./check-code-all.sh"
           docker compose -f docker-compose.yaml -f docker-compose.db.yaml down
 
       - name: Upload All coverage to Codecov
diff --git a/Dockerfile b/Dockerfile
index 8ad8061d..bf69f07b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,7 +69,6 @@ RUN EXTRAS=$([ "$ENVIRONMENT" = "deployment" ] || echo ",test") && \
            python3-pip))
 
 # Configure user
-USER ubuntu
 WORKDIR "/home/ubuntu"
 
 ENV GDAL_DISABLE_READDIR_ON_OPEN="EMPTY_DIR" \
diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
index 12a376b0..0dd2cd92 100644
--- a/docker-compose.prod.yaml
+++ b/docker-compose.prod.yaml
@@ -1,5 +1,5 @@
 # override default compose to change the launch command
 
 services:
-  ows_18:
+  ows:
     command: gunicorn -b '0.0.0.0:8000' --workers=3 -k gevent --timeout 121 --pid /home/ubuntu/gunicorn.pid --log-level info --worker-tmp-dir /dev/shm --config python:datacube_ows.gunicorn_config datacube_ows.wsgi