diff --git a/Makefile b/Makefile
index f120ad85f..6b2056343 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,8 @@ OLM_VERSION?=0.16.1
 KUBECTL?=kubectl
 KUBECONFIG?=./.kubeconfig
 KLUSTERLET_KUBECONFIG_CONTEXT?=$(shell $(KUBECTL) config current-context)
+KLUSTERLET_KIND_KUBECONFIG?=$(HOME)/cluster1-kubeconfig
+HUB_KIND_KUBECONFIG?=$(HOME)/hub-kubeconfig
 KIND_CLUSTER?=kind
 
 OPERATOR_SDK_ARCHOS:=x86_64-linux-gnu
@@ -101,6 +103,10 @@ install-olm: ensure-operator-sdk
 	$(KUBECTL) get crds | grep clusterserviceversion ; if [ $$? -ne 0 ] ; then $(OPERATOR_SDK) olm install --version $(OLM_VERSION); fi
 	$(KUBECTL) get ns open-cluster-management ; if [ $$? -ne 0 ] ; then $(KUBECTL) create ns open-cluster-management ; fi
 
+install-olm-kind: ensure-operator-sdk
+	$(KUBECTL) --kubeconfig=$(KLUSTERLET_KIND_KUBECONFIG) get crds | grep clusterserviceversion ; if [ $$? -ne 0 ] ; then $(OPERATOR_SDK) olm install --version $(OLM_VERSION); fi
+	$(KUBECTL) --kubeconfig=$(KLUSTERLET_KIND_KUBECONFIG) get ns open-cluster-management ; if [ $$? -ne 0 ] ; then $(KUBECTL) --kubeconfig=$(KLUSTERLET_KIND_KUBECONFIG) create ns open-cluster-management ; fi
+
 deploy-hub: deploy-hub-operator apply-hub-cr
 
 deploy-hub-operator: install-olm munge-hub-csv
@@ -116,6 +122,9 @@ clean-hub: ensure-operator-sdk
 cluster-ip:
   CLUSTER_IP?=$(shell $(KUBECTL) get svc kubernetes -n default -o jsonpath="{.spec.clusterIP}")
 
+cluster-hub-ip-kind:
+  CLUSTER_IP_KIND?=$(shell $(KUBECTL) --kubeconfig=$(HUB_KIND_KUBECONFIG) config view | grep server | awk '{ print $2 }' | cut -f3 -d/ | cut -f1 -d:)
+
 bootstrap-secret: cluster-ip
 	cp $(KUBECONFIG) dev-kubeconfig
 	$(KUBECTL) config use-context $(KLUSTERLET_KUBECONFIG_CONTEXT)
@@ -124,6 +133,13 @@ bootstrap-secret: cluster-ip
 	$(KUBECTL) delete secret bootstrap-hub-kubeconfig -n open-cluster-management-agent --ignore-not-found
 	$(KUBECTL) create secret generic bootstrap-hub-kubeconfig --from-file=kubeconfig=dev-kubeconfig -n open-cluster-management-agent
 
+bootstrap-secret-kind: cluster-hub-ip-kind
+	cp $(HUB_KIND_KUBECONFIG) dev-kubeconfig
+	$(KUBECTL) --kubeconfig=$(KLUSTERLET_KIND_KUBECONFIG) get ns open-cluster-management-agent; if [ $$? -ne 0 ] ; then $(KUBECTL) --kubeconfig=$(KLUSTERLET_KIND_KUBECONFIG) create ns open-cluster-management-agent; fi
+	$(KUBECTL) --kubeconfig dev-kubeconfig config set clusters.kind-$(KIND_CLUSTER).server https://$(CLUSTER_IP_KIND)
+	$(KUBECTL) --kubeconfig=$(KLUSTERLET_KIND_KUBECONFIG) delete secret bootstrap-hub-kubeconfig -n open-cluster-management-agent --ignore-not-found
+	$(KUBECTL) --kubeconfig=$(KLUSTERLET_KIND_KUBECONFIG) create secret generic bootstrap-hub-kubeconfig --from-file=kubeconfig=dev-kubeconfig -n open-cluster-management-agent
+
 # Registration e2e expects to read bootstrap secret from open-cluster-management/e2e-bootstrap-secret
 # TODO: think about how to factor this
 e2e-bootstrap-secret: cluster-ip
@@ -137,9 +153,17 @@ deploy-spoke: deploy-spoke-operator apply-spoke-cr
 deploy-spoke-operator: install-olm munge-spoke-csv bootstrap-secret
 	$(OPERATOR_SDK) run packagemanifests deploy/klusterlet/olm-catalog/klusterlet/ --namespace open-cluster-management --version $(CSV_VERSION) --install-mode SingleNamespace=open-cluster-management --timeout=10m
 
+deploy-spoke-kind: deploy-spoke-operator-kind apply-spoke-cr-kind
+
+deploy-spoke-operator-kind: install-olm-kind munge-spoke-csv bootstrap-secret-kind
+	$(OPERATOR_SDK) run packagemanifests deploy/klusterlet/olm-catalog/klusterlet/ --namespace open-cluster-management --version $(CSV_VERSION) --install-mode SingleNamespace=open-cluster-management --timeout=10m
+
 apply-spoke-cr:
 	$(SED_CMD) -e "s,quay.io/open-cluster-management/registration,$(REGISTRATION_IMAGE)," -e "s,quay.io/open-cluster-management/work,$(WORK_IMAGE)," deploy/klusterlet/config/samples/operator_open-cluster-management_klusterlets.cr.yaml | $(KUBECTL) apply -f -
 
+apply-spoke-cr-kind:
+	$(KUBECTL) --kubeconfig=$(KLUSTERLET_KIND_KUBECONFIG) apply -f deploy/klusterlet/config/samples/operator_open-cluster-management_klusterlets.cr.yaml
+
 clean-spoke: ensure-operator-sdk
 	$(KUBECTL) delete -f deploy/klusterlet/config/samples/operator_open-cluster-management_klusterlets.cr.yaml --ignore-not-found
 	$(OPERATOR_SDK) cleanup klusterlet --namespace open-cluster-management --timeout 10m