diff --git a/Dockerfile b/Dockerfile
index 76789b6..75fd530 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM quay.io/openshift/origin-must-gather:4.13 as builder
+FROM quay.io/openshift/origin-must-gather:4.10 as builder
 
-FROM registry.access.redhat.com/ubi9-minimal
-RUN echo -ne "[centos-9-stream-appstream]\nname = CentOS 9 Stream (RPMs) - AppStream\nbaseurl = https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/\nenabled = 1\ngpgcheck = 0" > /etc/yum.repos.d/centos.repo
+FROM registry.access.redhat.com/ubi8-minimal
+RUN echo -ne "[centos-8-stream-appstream]\nname = CentOS 8 Stream (RPMs) - AppStream\nbaseurl = http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/\nenabled = 1\ngpgcheck = 0" > /etc/yum.repos.d/centos.repo
 
 RUN microdnf -y install rsync tar gzip graphviz jq findutils
 
diff --git a/Makefile b/Makefile
index 4ab6817..8221c65 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 IMAGE_REGISTRY ?= quay.io
 IMAGE_TAG ?= latest
-IMAGE_NAME ?= kubev2v/forklift-must-gather
+IMAGE_NAME ?= konveyor/forklift-must-gather
 CONTAINER_ENGINE ?= $(shell if [ -e /usr/bin/podman ]; then echo "/usr/bin/podman"; else echo "docker"; fi)
 
 PROMETHEUS_LOCAL_DATA_DIR ?= /tmp/mig-prometheus-data-dump