diff --git a/Makefile b/Makefile
index 53963aa9..5a291da9 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 ?= dev
+TAG ?= v0.30.0
 
 .PHONY: all
 all: build
diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
index c20df17e..97155858 100644
--- a/config/default/manager_auth_proxy_patch.yaml
+++ b/config/default/manager_auth_proxy_patch.yaml
@@ -15,4 +15,4 @@ spec:
         - "--report-mode=0"
         - --shard-key=
         - "--v=5"
-        - "--version=dev"
+        - "--version=v0.30.0"
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
index 9668d7e6..555c09b8 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/addon-controller:dev
+      - image: projectsveltos/addon-controller:v0.30.0
         name: controller
diff --git a/go.mod b/go.mod
index 7be13651..1fd178a0 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.17.3
 	github.com/onsi/gomega v1.33.1
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/libsveltos v0.29.2-0.20240515110222-363f6838ddc0
+	github.com/projectsveltos/libsveltos v0.30.0
 	github.com/prometheus/client_golang v1.19.1
 	github.com/spf13/pflag v1.0.5
 	github.com/yuin/gopher-lua v1.1.1
diff --git a/go.sum b/go.sum
index 3720edf8..c7fb93ba 100644
--- a/go.sum
+++ b/go.sum
@@ -368,8 +368,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/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/libsveltos v0.29.2-0.20240515110222-363f6838ddc0 h1:xz2LXv5tiMeVQrc5kGT8sgwOowYIP3mRLX4me8kOO5w=
-github.com/projectsveltos/libsveltos v0.29.2-0.20240515110222-363f6838ddc0/go.mod h1:hCFMjAjY3d/h3Nw2ZBREFqDenhqYyZl2lJlybpEcuzM=
+github.com/projectsveltos/libsveltos v0.30.0 h1:kpKzVMAgoCSrw9S8VAo5kogDxgkRBLWKnLnsGNOa8I8=
+github.com/projectsveltos/libsveltos v0.30.0/go.mod h1:oy1tEoNFG6iWp1BizxEY2HOt5ytpXaaWivzz4EFElvY=
 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-agentless.yaml b/manifest/deployment-agentless.yaml
index 74659670..ebc13d1a 100644
--- a/manifest/deployment-agentless.yaml
+++ b/manifest/deployment-agentless.yaml
@@ -23,10 +23,10 @@ spec:
         - --report-mode=0
         - --agent-in-mgmt-cluster
         - --v=5
-        - --version=dev
+        - --version=v0.30.0
         command:
         - /manager
-        image: projectsveltos/addon-controller:dev
+        image: projectsveltos/addon-controller:v0.30.0
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/manifest/deployment-shard.yaml b/manifest/deployment-shard.yaml
index 366b34b2..9cf3d15d 100644
--- a/manifest/deployment-shard.yaml
+++ b/manifest/deployment-shard.yaml
@@ -23,10 +23,10 @@ spec:
         - --report-mode=0
         - --shard-key={{.SHARD}}
         - --v=5
-        - --version=dev
+        - --version=v0.30.0
         command:
         - /manager
-        image: projectsveltos/addon-controller:dev
+        image: projectsveltos/addon-controller:v0.30.0
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
index 2200d7b8..58d7e3c6 100644
--- a/manifest/manifest.yaml
+++ b/manifest/manifest.yaml
@@ -4054,10 +4054,10 @@ spec:
         - --report-mode=0
         - --shard-key=
         - --v=5
-        - --version=dev
+        - --version=v0.30.0
         command:
         - /manager
-        image: projectsveltos/addon-controller:dev
+        image: projectsveltos/addon-controller:v0.30.0
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go b/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go
index 92b349e3..ada13902 100644
--- a/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go
+++ b/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go
@@ -46,7 +46,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager:main
+        image: projectsveltos/drift-detection-manager:v0.30.0
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml b/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml
index 8903ca69..1025526c 100644
--- a/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml
+++ b/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml
@@ -28,7 +28,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager:main
+        image: projectsveltos/drift-detection-manager:v0.30.0
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/drift-detection/drift-detection-manager.go b/pkg/drift-detection/drift-detection-manager.go
index e1a12ba6..34260d76 100644
--- a/pkg/drift-detection/drift-detection-manager.go
+++ b/pkg/drift-detection/drift-detection-manager.go
@@ -130,7 +130,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager:main
+        image: projectsveltos/drift-detection-manager:v0.30.0
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/drift-detection/drift-detection-manager.yaml b/pkg/drift-detection/drift-detection-manager.yaml
index 3f46e6ea..1a70ba33 100644
--- a/pkg/drift-detection/drift-detection-manager.yaml
+++ b/pkg/drift-detection/drift-detection-manager.yaml
@@ -112,7 +112,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager:main
+        image: projectsveltos/drift-detection-manager:v0.30.0
         livenessProbe:
           failureThreshold: 3
           httpGet: