diff --git a/Dockerfile b/Dockerfile
index 2216048..bc68549 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ LABEL com.suse.release-stage="beta"
 # endlabelprefix
 
 
-RUN set -euo pipefail && zypper -n in --no-recommends postgresql14-server distribution-release && zypper -n clean && rm -rf /var/log/*
+RUN set -euo pipefail; zypper -n in --no-recommends postgresql14-server distribution-release; zypper -n clean; rm -rf /var/log/*
 
 ENV LANG="en_US.utf8"
 ENV PG_MAJOR="14"
@@ -37,9 +37,9 @@ CMD ["postgres"]
 VOLUME /var/lib/postgresql/data
 
 COPY docker-entrypoint.sh /usr/local/bin/
-RUN set -euo pipefail && chmod +x /usr/local/bin/docker-entrypoint.sh && \
-    ln -s su /usr/bin/gosu && \
-    mkdir /docker-entrypoint-initdb.d && \
+RUN set -euo pipefail; chmod +x /usr/local/bin/docker-entrypoint.sh; \
+    ln -s su /usr/bin/gosu; \
+    mkdir /docker-entrypoint-initdb.d; \
     sed -ri "s|^#?(listen_addresses)\s*=\s*\S+.*|\1 = '*'|" /usr/share/postgresql14/postgresql.conf.sample
 
 STOPSIGNAL SIGINT
diff --git a/postgres-14-image.changes b/postgres-14-image.changes
index 473a0f4..0fd09bd 100644
--- a/postgres-14-image.changes
+++ b/postgres-14-image.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Tue May  3 09:10:10 UTC 2022 - Dan Čermák <dcermak@suse.com>
+
+- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures