diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2441fc7c3175fc3fdc38313fd9ffd6c2f923221a..3c96261b1ed04955862b5a2b546efaa76ef1134e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,9 +45,9 @@ docker_build:
   image: docker:latest
   tags:
     - dind
-  rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_REF_PROTECTED == "true"'
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_REF_PROTECTED == "true"'
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker build -f docker/pipeline/Dockerfile . --tag $CI_REGISTRY_IMAGE/preprocess:latest
-    - docker push $CI_REGISTRY_IMAGE/preprocess:latest
+    - docker build -f docker/pipeline/Dockerfile . --tag $CI_REGISTRY_IMAGE/preprocess:$CI_COMMIT_SHORT_SHA
+    - docker push $CI_REGISTRY_IMAGE/preprocess:$CI_COMMIT_SHORT_SHA
diff --git a/docker/pipeline/Dockerfile b/docker/pipeline/Dockerfile
index a1099f5f5ea9de7cd9ee0961d81da70c7d8c5e4d..827655ea81f702c892d12df583f114f487d6f0d7 100644
--- a/docker/pipeline/Dockerfile
+++ b/docker/pipeline/Dockerfile
@@ -40,8 +40,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 WORKDIR /src
 
 # By default, build non-portable code, for the oldest CPU that supports AVX2
-ARG PORTABLE=FALSE
-ARG TARGET_CPU=haswell
+ARG PORTABLE=TRUE
+#ARG TARGET_CPU=haswell
 
 # Do not use `pip` from the Debian repository, but fetch it from PyPA.
 # This way, we are sure that the latest versions of `pip`, `setuptools`, and
@@ -70,7 +70,6 @@ RUN git -C casacore checkout ${CASACORE_COMMIT}
 RUN cmake \
     -DCMAKE_BUILD_TYPE:STRING=Release \
     -DPORTABLE=${PORTABLE} \
-    -DTARGET_CPU=${TARGET_CPU} \
     -H/src/casacore \
     -B/src/casacore/build \
     -G Ninja
@@ -83,7 +82,6 @@ RUN git -C LofarStMan checkout ${LOFARSTMAN_COMMIT}
 RUN cmake \
     -DCMAKE_BUILD_TYPE:STRING=Release \
     -DPORTABLE=${PORTABLE} \
-    -DTARGET_CPU=${TARGET_CPU} \
     -H/src/LofarStMan \
     -B/src/LofarStMan/build \
     -G Ninja
@@ -100,7 +98,6 @@ RUN cmake \
     -DBUILD_WITH_PYTHON=OFF \
     -DBUILD_TESTING=OFF \
     -DPORTABLE=${PORTABLE} \
-    -DTARGET_CPU=${TARGET_CPU} \
     -H/src/EveryBeam \
     -B/src/EveryBeam/build \
     -G Ninja
@@ -113,7 +110,6 @@ RUN git -C aoflagger checkout ${AOFLAGGER_COMMIT}
 RUN cmake \
     -DCMAKE_BUILD_TYPE:STRING=Release \
     -DPORTABLE=${PORTABLE} \
-    -DTARGET_CPU=${TARGET_CPU} \
     -H/src/aoflagger \
     -B/src/aoflagger/build \
     -G Ninja
@@ -140,7 +136,6 @@ RUN cmake \
     -DCMAKE_BUILD_TYPE:STRING=Release \
     -DBUILD_TESTING=OFF \
     -DPORTABLE=${PORTABLE} \
-    -DTARGET_CPU=${TARGET_CPU} \
     -DLIBDIRAC_PREFIX=/usr/local/ \
     -DMETADATA_COMPRESSION_DEFAULT=True \
     -H/src/DP3 \