diff --git a/SOURCES/toolbox.conf b/SOURCES/toolbox.conf
index 8ef3b3a..f934f2b 100644
--- a/SOURCES/toolbox.conf
+++ b/SOURCES/toolbox.conf
@@ -14,4 +14,4 @@
 # If the name does not contain a registry, the local image storage will be
 # consulted, and if it's not present there then it will be pulled from a
 # suitable remote registry.
-image = "registry.redhat.io/rhel8/support-tools:latest"
+image = "registry.access.redhat.com/ubi8/toolbox:latest"
diff --git a/SPECS/toolbox.spec b/SPECS/toolbox.spec
index d41adce..31f9b30 100644
--- a/SPECS/toolbox.spec
+++ b/SPECS/toolbox.spec
@@ -9,7 +9,7 @@ Version:       0.0.99.3
 %global goipath github.com/containers/%{name}
 %gometa
 
-Release:       0.3%{?dist}
+Release:       0.4%{?dist}
 Summary:       Unprivileged development environment
 
 License:       ASL 2.0
@@ -114,6 +114,10 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Mon Sep 20 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-0.4
+- Switch to using the Toolbox-specific UBI image by default
+Resolves: #2004562
+
 * Thu Sep 02 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-0.3
 - Suggest a way forward if coreos/toolbox was used
 Resolves: #1998191