diff --git a/Dockerfile b/Dockerfile
index 0ff1128..75c0ba7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: MIT
 #!BuildTag: suse/rmt-server:2.7
+#!BuildTag: suse/rmt-server:latest
 #!BuildTag: suse/rmt-server:2.7-%RELEASE%
 FROM opensuse/tumbleweed:latest
 
@@ -23,11 +24,11 @@ LABEL com.suse.release-stage="beta"
 # endlabelprefix
 
 
-RUN set -euo pipefail && zypper -n in --no-recommends rmt-server catatonit && zypper -n clean && rm -rf /var/log/*
+RUN set -euo pipefail; zypper -n in --no-recommends rmt-server catatonit; zypper -n clean; rm -rf /var/log/*
 
 ENV RAILS_ENV="production"
 ENV LANG="en"
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 CMD ["/usr/share/rmt/bin/rails", "server", "-e", "production"]
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
+RUN set -euo pipefail; chmod +x /usr/local/bin/entrypoint.sh
diff --git a/rmt-server-image.changes b/rmt-server-image.changes
index 473a0f4..da86ae4 100644
--- a/rmt-server-image.changes
+++ b/rmt-server-image.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Tue May  3 09:03:35 UTC 2022 - Dan Čermák <dcermak@suse.com>
+
+- Use set -euo pipefail in every RUN command, use ; instead of && to prevent masking failures