diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 457c851e260d0c8db83689072f94e219e10cb9c1..e3999dbec3d4ec27cfdd02340e41ec6abc515453 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,13 +41,16 @@ imageupdate:
   tags:
     - roadrunner
   script:
+    - docker image rm gitlabci_notebook || echo "Could not remove image"
     - docker build --tag gitlabci_notebook .
   only:
-    refs:
-      - branches
     changes:
       - Dockerfile
-      - environment.yaml
+      - environment.yml
+  except:
+    refs:
+      - master
+      - merge_requests
 
 pages:
   stage: deploy
diff --git a/Dockerfile b/Dockerfile
index eed74d67b713d3a5cd9e6678033e7616e9399090..c464c9bac5cac44e2290f85a8cdb5ab17e69a7c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,13 +2,15 @@ FROM mambaorg/micromamba:0.15.3
 
 COPY environment.yml /tmp/env.yaml
 
+USER root
+RUN apt-get update && apt-get install build-essential -y
+RUN apt-get install git -y
+
 RUN micromamba install -y -n base -f /tmp/env.yaml && \
     micromamba clean --all --yes
 
 ENV PATH=$PATH:/micromamba/pcondabin:/micromamba/bin
 USER root
-RUN apt-get update && apt-get install build-essential -y
-RUN apt-get install git -y
 
 RUN python -m ipykernel install --name python3 --display-name "python3" --user 
 
diff --git a/environment.yml b/environment.yml
index a3c27fe4624b0b1815a6fe0d84633a0b25b1bfd3..8df37a61ac8d227f513d3df1697bbe39961d7a0c 100644
--- a/environment.yml
+++ b/environment.yml
@@ -37,8 +37,10 @@ dependencies:
 #psyplot
   - psy-maps
   - psyplot
-  - cfchecker
-  - pyessv
+#atmodat
+  - compliance-checker
+  - cfunits
+  - udunits2
 #
 #for psyplot on centos:
 #sudo ln -s /usr/lib64/libc.so.6 /usr/lib64/libc.musl-x86_64.so.1
@@ -49,6 +51,5 @@ dependencies:
   - pip:
     - sphinx-book-theme
     - pangeo-xesmf #for raster data
-    - git+https://github.com/cedadev/cc-yaml@master
-    - git+https://github.com/cedadev/compliance-check-lib@master
-    - git+https://github.com/AtMoDat/atmodat_data_checker@master
+#For atmodat checker
+    - git+https://github.com/AtMoDat/atmodat_data_checker