diff --git a/hack/e2e.sh b/hack/e2e.sh
index ba8bc6f617..37eb526734 100755
--- a/hack/e2e.sh
+++ b/hack/e2e.sh
@@ -65,7 +65,7 @@ export GC_KIND="false"
 # Run the vpn client in container
 docker run --rm -d --name vpn -v "${HOME}/.openvpn/:${HOME}/.openvpn/" \
   -w "${HOME}/.openvpn/" --cap-add=NET_ADMIN --net=host --device=/dev/net/tun \
-  gcr.io/cluster-api-provider-vsphere/extra/openvpn:latest
+  gcr.io/k8s-staging-capi-vsphere/extra/openvpn:latest
 
 # Tail the vpn logs
 docker logs vpn
diff --git a/hack/tools/openvpn/Makefile b/hack/tools/openvpn/Makefile
index 396ebd942b..d5d866dae8 100644
--- a/hack/tools/openvpn/Makefile
+++ b/hack/tools/openvpn/Makefile
@@ -15,7 +15,7 @@
 all: build
 
 VERSION ?= $(shell git describe --always --dirty)
-IMAGE_NAME ?= gcr.io/cluster-api-provider-vsphere/extra/openvpn
+IMAGE_NAME ?= gcr.io/k8s-staging-capi-vsphere/extra/openvpn
 IMAGE_TAG ?= $(IMAGE_NAME):$(VERSION)
 
 build: