diff --git a/cni.Dockerfile b/cni.Dockerfile
index bcfb072ca..ad111e052 100644
--- a/cni.Dockerfile
+++ b/cni.Dockerfile
@@ -11,7 +11,8 @@ ARG UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/mas
 ARG OSLO_LOCK_PATH=/var/kuryr-lock
 ARG PKG_YUM_REPO=https://rdoproject.org/repos/rdo-release.rpm
 
-RUN yum install -y epel-release $PKG_YUM_REPO \
+RUN yum upgrade -y \
+    && yum install -y epel-release $PKG_YUM_REPO \
     && yum install -y --setopt=tsflags=nodocs python3-pip openvswitch sudo iproute libstdc++ pciutils kmod-libs \
     && yum install -y --setopt=tsflags=nodocs gcc gcc-c++ python3-devel git
 
diff --git a/controller.Dockerfile b/controller.Dockerfile
index 8d0daa6f5..a7093fbbc 100644
--- a/controller.Dockerfile
+++ b/controller.Dockerfile
@@ -3,7 +3,8 @@ LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Michał Dulko<mdulko@redh
 
 ARG UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/master"
 
-RUN yum install -y epel-release \
+RUN yum upgrade -y \
+    && yum install -y epel-release \
     && yum install -y --setopt=tsflags=nodocs python3-pip libstdc++ \
     && yum install -y --setopt=tsflags=nodocs gcc gcc-c++ python3-devel git
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 84a9d831e..bdd9ab610 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -17,9 +17,9 @@ set -o xtrace
 
 function container_runtime {
     if [[ ${CONTAINER_ENGINE} == 'crio' ]]; then
-        sudo podman "$@"
+        sudo podman "$@" || die $LINENO "Error when running podman command"
     else
-        docker "$@"
+        docker "$@" || die $LINENO "Error when running docker command"
     fi
 }