diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8913d916a336e0f8118b25e7c195b145ab73d820..6cd4950f91f543f119c83cda009d01e6a074b6de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: ligo/software:stretch
+image: igwn/base:buster
 
 stages:
 - test
@@ -9,16 +9,19 @@ test:
   before_script:
   - echo $CI_COMMIT_SHA | cut -b1-8 > gitID.txt
   script:
+  - rm -rf ifo gwinc_test_report.pdf
+  - mkdir ifo
   - apt-get update -qq
-  - apt-get install -y -qq python3-yaml python3-scipy python3-matplotlib python3-ipython lalsimulation-python3 python3-pypdf2
+  - apt-get install -y -qq git python3-yaml python3-scipy python3-matplotlib python3-ipython lalsimulation-python3 python3-pypdf2 python3-h5py
   - git clone https://gitlab-ci-token:ci_token@git.ligo.org/gwinc/inspiral_range.git
   - export PYTHONPATH=inspiral_range
   - export MPLBACKEND=agg
+  - python3 -m gwinc.test -r gwinc_test_report.pdf
   - for ifo in aLIGO Aplus Voyager CE1 CE2; do
-  -     python3 -m gwinc $ifo -s $ifo.png
+  -     python3 -m gwinc $ifo -s ifo/$ifo.png
+  -     python3 -m gwinc $ifo -s ifo/$ifo.h5
   - done
-  - python3 -m gwinc.ifo -s all_compare.png
-  - python3 -m gwinc.test -r gwinc_test_report.pdf
+  - python3 -m gwinc.ifo -s ifo/all_compare.png
   after_script:
   - rm gitID.txt
   cache:
@@ -28,12 +31,7 @@ test:
     when: always
     expire_in: 4w
     paths:
-    - aLIGO.png
-    - Aplus.png
-    - Voyager.png
-    - CE1.png
-    - CE2.png
-    - all_compare.png
+    - ifo
     - gwinc_test_report.pdf
 
 pages:
@@ -41,14 +39,9 @@ pages:
   dependencies:
   - test
   script:
-  - mkdir public
-  - for ifo in aLIGO Aplus Voyager CE1 CE2; do
-  -     mv $ifo.png public/
-  - done
-  - mv all_compare.png public/ || true
-  - mv gwinc_test_report.pdf public/ || true
-  - apt-get install -y -qq python3-pip python3-dev make
-  - pip3 install sphinx sphinx-rtd-theme
+  - rm -rf public
+  - mv ifo public
+  - apt-get install -y -qq python3-sphinx-rtd-theme
   - cd docs
   - make html
   - cd ..