diff --git a/Makefile b/Makefile
index 429e306..39c40c5 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ ARCH ?= amd64
 OS ?= $(shell uname -s | tr A-Z a-z)
 K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
 export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
-TAG ?= v0.27.0
+TAG ?= main
 
 .PHONY: all
 all: build
@@ -61,7 +61,6 @@ CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
 ENVSUBST := $(TOOLS_BIN_DIR)/envsubst
 GOIMPORTS := $(TOOLS_BIN_DIR)/goimports
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
-KUSTOMIZE := $(TOOLS_BIN_DIR)/kustomize
 GINKGO := $(TOOLS_BIN_DIR)/ginkgo
 SETUP_ENVTEST := $(TOOLS_BIN_DIR)/setup_envs
 CLUSTERCTL := $(TOOLS_BIN_DIR)/clusterctl
@@ -118,13 +117,6 @@ $(KUBECTL):
 	curl -L https://storage.googleapis.com/kubernetes-release/release/$(K8S_LATEST_VER)/bin/$(OS)/$(ARCH)/kubectl -o $@
 	chmod +x $@
 
-KUSTOMIZE_VER := v4.5.2
-KUSTOMIZE_BIN := kustomize
-KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
-KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
-$(KUSTOMIZE): # Build kustomize from tools folder.
-	CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
-
 .PHONY: tools
 tools: $(CONTROLLER_GEN) $(ENVSUBST) $(KUSTOMIZE) $(GOLANGCI_LINT) $(SETUP_ENVTEST) $(GOIMPORTS) $(GINKGO) $(CLUSTERCTL) $(KIND) $(KUBECTL) ## build all tools
 
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
index 9b6512c..4a22681 100644
--- a/config/default/manager_image_patch.yaml
+++ b/config/default/manager_image_patch.yaml
@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: projectsveltos/healthcheck-manager:v0.27.0
+      - image: projectsveltos/healthcheck-manager:main
         name: manager
diff --git a/go.mod b/go.mod
index 410355a..5d2909a 100644
--- a/go.mod
+++ b/go.mod
@@ -12,8 +12,8 @@ require (
 	github.com/onsi/ginkgo/v2 v2.17.1
 	github.com/onsi/gomega v1.32.0
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/addon-controller v0.27.0
-	github.com/projectsveltos/libsveltos v0.27.0
+	github.com/projectsveltos/addon-controller v0.27.1-0.20240405170833-7fa049caf6a3
+	github.com/projectsveltos/libsveltos v0.27.1-0.20240405132615-9e1a36ca5c8f
 	github.com/prometheus/client_golang v1.19.0
 	github.com/slack-go/slack v0.12.5
 	github.com/spf13/pflag v1.0.5
diff --git a/go.sum b/go.sum
index 906c89f..99bb9a4 100644
--- a/go.sum
+++ b/go.sum
@@ -349,10 +349,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
 github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
-github.com/projectsveltos/addon-controller v0.27.0 h1:7eCsBXMS6HqYJthoV4Qn0wRpzBL7AKIQHXeKYiCzJsI=
-github.com/projectsveltos/addon-controller v0.27.0/go.mod h1:VNIz+F//L2+QqB3Rhez4E3GO7wawUd1y/CWai7dF1vU=
-github.com/projectsveltos/libsveltos v0.27.0 h1:67fetkwg5toyu/GiOMjfXug13DAnxAcemClWtTcAw9Q=
-github.com/projectsveltos/libsveltos v0.27.0/go.mod h1:Uq3KYj5LKQYttA3yVb0O/V5Uvi2Qy7B23tnB5fBAMFg=
+github.com/projectsveltos/addon-controller v0.27.1-0.20240405170833-7fa049caf6a3 h1:cHyFo49ZLff980tc3Qxlb4e/xLHAQ0aQnIjgECbtf5c=
+github.com/projectsveltos/addon-controller v0.27.1-0.20240405170833-7fa049caf6a3/go.mod h1:i9dFWaOrVzQSPXyACKxBkcgq3eH8TmlGw0DIFvWizVI=
+github.com/projectsveltos/libsveltos v0.27.1-0.20240405132615-9e1a36ca5c8f h1:FCmjCYxO/5irmocHXcuVfg9fT74NoN1G4k64/SwWdMo=
+github.com/projectsveltos/libsveltos v0.27.1-0.20240405132615-9e1a36ca5c8f/go.mod h1:Uq3KYj5LKQYttA3yVb0O/V5Uvi2Qy7B23tnB5fBAMFg=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
diff --git a/manifest/deployment-shard.yaml b/manifest/deployment-shard.yaml
index 94e2f20..a7792b8 100644
--- a/manifest/deployment-shard.yaml
+++ b/manifest/deployment-shard.yaml
@@ -24,7 +24,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/healthcheck-manager:v0.27.0
+        image: projectsveltos/healthcheck-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
index 20d7606..40014b6 100644
--- a/manifest/manifest.yaml
+++ b/manifest/manifest.yaml
@@ -223,7 +223,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/healthcheck-manager:v0.27.0
+        image: projectsveltos/healthcheck-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet: