diff --git a/ci/build.sh b/ci/build.sh
index 8ed171d..5459cc8 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-set -e -u
+set -euo pipefail
 
 export TERM=${TERM:-dumb}
 
diff --git a/ci/build.yml b/ci/build.yml
index 82a85c4..db0444d 100644
--- a/ci/build.yml
+++ b/ci/build.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cfje/java-test-applications
     tag:        boot-2
diff --git a/ci/unit-test.sh b/ci/unit-test.sh
index 8eaf0db..aeee3d5 100755
--- a/ci/unit-test.sh
+++ b/ci/unit-test.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-set -e -u
+set -euo pipefail
 
 export TERM=${TERM:-dumb}
 
diff --git a/ci/unit-test.yml b/ci/unit-test.yml
index c0e9880..9b4d05a 100644
--- a/ci/unit-test.yml
+++ b/ci/unit-test.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cfje/java-test-applications
     tag:        boot-2