diff --git a/Dockerfile b/Dockerfile
index 1f523f518..219f0a2e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,11 @@
 #   Red Hat, Inc. - initial API and implementation
 #
 
-# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/rhel8/go-toolset
-FROM registry.redhat.io/rhel8/go-toolset:1.11.5-8 as builder
+# NOTE: using registry.access.redhat.com/rhel8/go-toolset does not work (user is requested to use registry.redhat.io)
+# NOTE: using registry.redhat.io/rhel8/go-toolset requires login, which complicates automation
+# NOTE: since updateBaseImages.sh does not support other registries than RHCC, update to RHEL8
+# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/devtools/go-toolset-rhel7
+FROM registry.access.redhat.com/devtools/go-toolset-rhel7:1.11.5-3.1553822355 as builder
 ENV PATH=/opt/rh/go-toolset-1.11/root/usr/bin:$PATH \
     GOPATH=/go/
 
diff --git a/e2e/run-okd-tests.sh b/e2e/run-okd-tests.sh
index 8111659f2..a1f371305 100755
--- a/e2e/run-okd-tests.sh
+++ b/e2e/run-okd-tests.sh
@@ -65,8 +65,8 @@ docker run -t \
 
 cp ${OPERATOR_REPO}/tmp/run-tests ${OPERATOR_REPO}/run-tests
 
-echo "[INFO] Pull operator docker image..."
-cd ${OPERATOR_REPO} && docker pull quay.io/crw/operator-rhel8:latest
+echo "[INFO] Build operator docker image..."
+cd ${OPERATOR_REPO} && docker build -t che/operator -f Dockerfile .
 
 echo "[INFO] Run tests..."
 cd ${OPERATOR_REPO} && ./run-tests