diff --git a/sbin/tag_and_push_docker_image.sh b/sbin/tag_and_push_docker_image.sh
index 484b1d6818691ad61a9d222a27f00a4415e005f1..d38685b846164ce03cbf1c89e24a380f926268b5 100755
--- a/sbin/tag_and_push_docker_image.sh
+++ b/sbin/tag_and_push_docker_image.sh
@@ -41,7 +41,18 @@ fi
 LOCAL_IMAGES=(
   "elk elk" "elk-configure-host elk-configure-host" "grafana grafana"
   "prometheus prometheus" "lofar-device-base lofar-device-base"
-  "jupyter docker-compose_jupyter" "itango docker-compose_itango"
+
+  "apsct-sim docker-compose_apsct-sim" "apspu-sim docker-compose_apspu-sim"
+  "recv-sim docker-compose_recv-sim" "sdptr-sim docker-compose_sdptr-sim"
+  "unb2-sim docker-compose_unb2-sim"
+
+  "device-apsct device-apsct" "device-apspu device-apspu"
+  "device-boot device-boot" "device-docker device-docker"
+  "device-observation_control device-observation_control"
+  "device-recv device-recv" "device-sdp device-sdp" "device-sst device-sst"
+  "device-unb2 device-unb2" "device-xst device-xst"
+
+  "itango docker-compose_itango" "jupyter docker-compose_jupyter"
   "integration-test docker-compose_integration-test"
   "tango-prometheus-exporter docker-compose_tango-prometheus-exporter"
 )
@@ -102,7 +113,8 @@ if [ ! -z "${1+x}" ] && [ "${1}" == "pull" ]; then
 
   for image in "${LOCAL_IMAGES[@]}"; do
     local_url="${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/${image}"
-    docker pull "${local_url}:${tag}" || docker pull "${local_url}:latest"
+    # Pull images, at least one of the two immages must succeed
+    docker pull "${local_url}:${tag}" || docker pull "${local_url}:latest" || exit 1
   done
 
   exit 0