diff --git a/.semaphore/semaphore.yml.d/blocks/20-typha.yml b/.semaphore/semaphore.yml.d/blocks/20-typha.yml
index 7a3db13d000..f5ba23e00bc 100644
--- a/.semaphore/semaphore.yml.d/blocks/20-typha.yml
+++ b/.semaphore/semaphore.yml.d/blocks/20-typha.yml
@@ -15,8 +15,8 @@
         commands:
           - ../.semaphore/run-and-monitor make-fv-ubi.log make clean image fv
         env_vars:
-          - name: CALICO_BASE
-            value: registry.access.redhat.com/ubi8/ubi-minimal
+          - name: USE_UBI_AS_CALICO_BASE
+            value: 1
     epilogue:
       always:
         commands:
diff --git a/lib.Makefile b/lib.Makefile
index b7e13e27fbb..e16c31cbc6b 100644
--- a/lib.Makefile
+++ b/lib.Makefile
@@ -262,7 +262,11 @@ REPO_ROOT := $(shell git rev-parse --show-toplevel)
 CERTS_PATH := $(REPO_ROOT)/hack/test/certs
 
 # The image to use for building calico/base-dependent modules (e.g. apiserver, typha).
+ifdef USE_UBI_AS_CALICO_BASE
+CALICO_BASE ?= $(UBI_IMAGE)
+else
 CALICO_BASE ?= calico/base
+endif
 
 QEMU_IMAGE ?= calico/qemu-user-static:latest