diff --git a/Dockerfile b/Dockerfile
index 76c77a4279..424cc1b97c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/_o
 COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/assets ${APP_ROOT}
 COPY --from=tuned   /root/rpmbuild/RPMS/noarch /root/rpms
 RUN INSTALL_PKGS=" \
-      socat \
+      socat procps-ng \
       " && \
     mkdir -p /etc/grub.d/ /boot && \
     yum install --setopt=tsflags=nodocs -y $INSTALL_PKGS && \
diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
index aa9d943961..d29452623c 100644
--- a/Dockerfile.rhel7
+++ b/Dockerfile.rhel7
@@ -26,7 +26,7 @@ COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/_o
 COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/assets ${APP_ROOT}
 COPY --from=tuned   /root/rpmbuild/RPMS/noarch /root/rpms
 RUN INSTALL_PKGS=" \
-      socat \
+      socat procps-ng \
       " && \
     mkdir -p /etc/grub.d/ /boot && \
     yum install --setopt=tsflags=nodocs -y $INSTALL_PKGS && \
diff --git a/Dockerfile.rhel8 b/Dockerfile.rhel8
index 38fb589f06..1895eb3104 100644
--- a/Dockerfile.rhel8
+++ b/Dockerfile.rhel8
@@ -1,9 +1,9 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-node-tuning-operator
 COPY . .
 RUN make build
 
-FROM registry.svc.ci.openshift.org/ocp/4.6:base AS tuned
+FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.6 AS tuned
 WORKDIR /root
 COPY assets/tuned /root
 RUN INSTALL_PKGS=" \
@@ -27,7 +27,7 @@ COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/_o
 COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/assets ${APP_ROOT}
 COPY --from=tuned   /root/rpmbuild/RPMS/noarch /root/rpms
 RUN INSTALL_PKGS=" \
-      socat \
+      socat procps-ng \
       " && \
     mkdir -p /etc/grub.d/ /boot && \
     yum install --setopt=tsflags=nodocs -y $INSTALL_PKGS && \
diff --git a/test/e2e/util/util.go b/test/e2e/util/util.go
index bd872f673c..f9fccac91d 100644
--- a/test/e2e/util/util.go
+++ b/test/e2e/util/util.go
@@ -85,7 +85,7 @@ func GetSysctl(sysctlVar string, pod *corev1.Pod) (string, error) {
 		out, err = exec.Command("oc", "rsh", "-n", ntoconfig.OperatorNamespace(), pod.Name,
 			"sysctl", "-n", sysctlVar).CombinedOutput()
 		if err != nil {
-			explain = fmt.Sprintf("failed to query sysctl %s on %s", sysctlVar, pod.Name)
+			explain = fmt.Sprintf("out=%s; err=%s", string(out), err.Error())
 			return false, nil
 		}
 		val = strings.TrimSpace(string(out))