diff --git a/Dockerfile b/Dockerfile
index 625a3c1..a6d6bff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ LABEL com.suse.release-stage="beta"
 # endlabelprefix
 
 
-RUN set -euo pipefail && zypper -n in --no-recommends java-17-openjdk && zypper -n clean && rm -rf /var/log/*
+RUN set -euo pipefail; zypper -n in --no-recommends java-17-openjdk; zypper -n clean; rm -rf /var/log/*
 
 ENV JAVA_BINDIR="/usr/lib64/jvm/java/bin"
 ENV JAVA_HOME="/usr/lib64/jvm/java"
diff --git a/openjdk-17-image.changes b/openjdk-17-image.changes
index 473a0f4..ab9bb2e 100644
--- a/openjdk-17-image.changes
+++ b/openjdk-17-image.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Tue May  3 09:09:21 UTC 2022 - Dan Čermák <dcermak@suse.com>
+
+- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures