diff --git a/Makefile b/Makefile
index 912f73c..56733f4 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,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.34.0
+TAG ?= main
 
 ## Tool Binaries
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
index 54c61ab..a5e8f84 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/shard-controller:v0.34.0
+      - image: projectsveltos/shard-controller:main
         name: manager
diff --git a/go.mod b/go.mod
index 4a8cf6c..78346f5 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/libsveltos v0.34.0
+	github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc
 	github.com/spf13/pflag v1.0.5
 	golang.org/x/text v0.16.0
 	k8s.io/api v0.30.2
diff --git a/go.sum b/go.sum
index 05e5e1c..e69f151 100644
--- a/go.sum
+++ b/go.sum
@@ -111,8 +111,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/projectsveltos/libsveltos v0.34.0 h1:1HYQR/Q2RkWPOZre9QJowKTUuX4PnU6x2/ev6A3xYes=
-github.com/projectsveltos/libsveltos v0.34.0/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg=
+github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc h1:qZB1eNQLeahLKF45SeMgMhzPGt5O/fU7u0p8I3lrn88=
+github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg=
 github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
 github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
index 187ba63..afb25db 100644
--- a/manifest/manifest.yaml
+++ b/manifest/manifest.yaml
@@ -151,7 +151,7 @@ spec:
         - --report-mode=0
         command:
         - /manager
-        image: projectsveltos/shard-controller:v0.34.0
+        image: projectsveltos/shard-controller:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/sharding/ac.yaml b/pkg/sharding/ac.yaml
index 2afafb3..4c9eed1 100644
--- a/pkg/sharding/ac.yaml
+++ b/pkg/sharding/ac.yaml
@@ -23,10 +23,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.34.0
+        - --version=main
         command:
         - /manager
-        image: projectsveltos/addon-controller:v0.34.0
+        image: projectsveltos/addon-controller:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/sharding/addon-controller.go b/pkg/sharding/addon-controller.go
index 3e66336..a600cd0 100644
--- a/pkg/sharding/addon-controller.go
+++ b/pkg/sharding/addon-controller.go
@@ -41,10 +41,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.34.0
+        - --version=main
         command:
         - /manager
-        image: projectsveltos/addon-controller:v0.34.0
+        image: projectsveltos/addon-controller:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/sharding/classifier.go b/pkg/sharding/classifier.go
index f6442b6..f2cf791 100644
--- a/pkg/sharding/classifier.go
+++ b/pkg/sharding/classifier.go
@@ -41,10 +41,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.34.0
+        - --version=main
         command:
         - /manager
-        image: projectsveltos/classifier:v0.34.0
+        image: projectsveltos/classifier:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/sharding/classifier.yaml b/pkg/sharding/classifier.yaml
index d971565..ffd1518 100644
--- a/pkg/sharding/classifier.yaml
+++ b/pkg/sharding/classifier.yaml
@@ -23,10 +23,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=v0.34.0
+        - --version=main
         command:
         - /manager
-        image: projectsveltos/classifier:v0.34.0
+        image: projectsveltos/classifier:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/sharding/em.yaml b/pkg/sharding/em.yaml
index 07ffdba..83a7177 100644
--- a/pkg/sharding/em.yaml
+++ b/pkg/sharding/em.yaml
@@ -24,7 +24,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/event-manager:v0.34.0
+        image: projectsveltos/event-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/sharding/event-manager.go b/pkg/sharding/event-manager.go
index 4bd3df8..0d3940c 100644
--- a/pkg/sharding/event-manager.go
+++ b/pkg/sharding/event-manager.go
@@ -42,7 +42,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/event-manager:v0.34.0
+        image: projectsveltos/event-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/sharding/healthcheck-manager.go b/pkg/sharding/healthcheck-manager.go
index d25b46c..8846acb 100644
--- a/pkg/sharding/healthcheck-manager.go
+++ b/pkg/sharding/healthcheck-manager.go
@@ -42,7 +42,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/healthcheck-manager:v0.34.0
+        image: projectsveltos/healthcheck-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/sharding/hm.yaml b/pkg/sharding/hm.yaml
index fef151a..a7792b8 100644
--- a/pkg/sharding/hm.yaml
+++ b/pkg/sharding/hm.yaml
@@ -24,7 +24,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/healthcheck-manager:v0.34.0
+        image: projectsveltos/healthcheck-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/sharding/sc.yaml b/pkg/sharding/sc.yaml
index d89300f..a9eb6f1 100644
--- a/pkg/sharding/sc.yaml
+++ b/pkg/sharding/sc.yaml
@@ -24,7 +24,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/sveltoscluster-manager:v0.34.0
+        image: projectsveltos/sveltoscluster-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/sharding/sveltoscluster-manager.go b/pkg/sharding/sveltoscluster-manager.go
index dceccdb..8bf5ddc 100644
--- a/pkg/sharding/sveltoscluster-manager.go
+++ b/pkg/sharding/sveltoscluster-manager.go
@@ -42,7 +42,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/sveltoscluster-manager:v0.34.0
+        image: projectsveltos/sveltoscluster-manager:main
         livenessProbe:
           failureThreshold: 3
           httpGet: