diff --git a/Dockerfile b/Dockerfile
index 3a600ac34e850ee3bbdde7b73b8ab90c1b51066d..11697b38c886e262590a468172fd2e891fb8e1dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,18 @@
-FROM continuumio/miniconda3:latest
-
-RUN groupadd -r ics && useradd -r -g ics ics
+FROM registry.esss.lu.se/ics-docker/centos-miniconda3:4.4
 
+USER root
 WORKDIR /app
+RUN chown conda:users /app
+
+USER conda
 
 # Install CSEntry requirements
 COPY environment.yml /app/environment.yml
-RUN conda config --add channels conda-forge \
-    && conda env create -n csentry -f environment.yml \
+RUN conda env create -n csentry -f environment.yml \
     && rm -rf /opt/conda/pkgs/*
 
 # Install the app
 COPY . /app/
-RUN chown -R ics:ics /app/*
 
 # activate the csentry environment
 ENV PATH /opt/conda/envs/csentry/bin:$PATH
diff --git a/Makefile b/Makefile
index cdbd713859542c4e03f5409c2096f50e1f50b93d..8683aa1e05c1e12212870465162619815941da2a 100644
--- a/Makefile
+++ b/Makefile
@@ -59,4 +59,4 @@ test_image:  ## run the tests (on the latest image)
 	docker-compose -f docker-compose.yml run --rm web
 
 run_uwsgi:  ## run the application with uwsgi (to test prod env)
-	docker-compose run -p 8000:8000 --rm web uwsgi --master --http 0.0.0.0:8000 --http-keepalive --manage-script-name --mount /csentry=wsgi.py --callable app --uid ics --processes 2 -b 16384
+	docker-compose run -p 8000:8000 --rm web uwsgi --master --http 0.0.0.0:8000 --http-keepalive --manage-script-name --mount /csentry=wsgi.py --callable app --uid conda --processes 2 -b 16384