diff --git a/Makefile b/Makefile
index dfd1aa1..3930d1e 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ ARCH ?= $(shell go env GOARCH)
 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 ?= main
+TAG ?= v0.47.0
 
 ## Tool Binaries
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
@@ -375,4 +375,4 @@ sveltos-agent:
 	sed -i'' -e "s#image: docker.io/projectsveltos/sveltos-agent:${TAG}#image: docker.io/projectsveltos/sveltos-agent@${digest}#g" ./pkg/agent/sveltos-agent.yaml
 	curl -L https://raw.githubusercontent.com/projectsveltos/sveltos-agent/$(TAG)/manifest/mgmt_cluster_manifest.yaml -o ./pkg/agent/sveltos-agent-in-mgmt-cluster.yaml	
 	sed -i'' -e "s#image: docker.io/projectsveltos/sveltos-agent:${TAG}#image: docker.io/projectsveltos/sveltos-agent@${digest}#g" ./pkg/agent/sveltos-agent-in-mgmt-cluster.yaml
-	cd pkg/agent; go generate
\ No newline at end of file
+	cd pkg/agent; go generate
diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
index 896b0bb..b690e7a 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=main"
+        - "--version=v0.47.0"
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
index e82c105..785cc06 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: docker.io/projectsveltos/classifier:main
+      - image: docker.io/projectsveltos/classifier:v0.47.0
         name: manager
diff --git a/manifest/deployment-agentless.yaml b/manifest/deployment-agentless.yaml
index 7b98f6d..530e966 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=main
+        - --version=v0.47.0
         command:
         - /manager
-        image: docker.io/projectsveltos/classifier:main
+        image: docker.io/projectsveltos/classifier:v0.47.0
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/manifest/deployment-shard.yaml b/manifest/deployment-shard.yaml
index 160525b..f921d33 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=main
+        - --version=v0.47.0
         command:
         - /manager
-        image: docker.io/projectsveltos/classifier:main
+        image: docker.io/projectsveltos/classifier:v0.47.0
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
index 55107e5..0299627 100644
--- a/manifest/manifest.yaml
+++ b/manifest/manifest.yaml
@@ -157,10 +157,10 @@ spec:
         - --report-mode=0
         - --shard-key=
         - --v=5
-        - --version=main
+        - --version=v0.47.0
         command:
         - /manager
-        image: docker.io/projectsveltos/classifier:main
+        image: docker.io/projectsveltos/classifier:v0.47.0
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/agent/sveltos-agent-in-mgmt-cluster.go b/pkg/agent/sveltos-agent-in-mgmt-cluster.go
index 2cfa0b4..33407ea 100644
--- a/pkg/agent/sveltos-agent-in-mgmt-cluster.go
+++ b/pkg/agent/sveltos-agent-in-mgmt-cluster.go
@@ -42,12 +42,12 @@ spec:
         - --cluster-namespace=
         - --cluster-name=
         - --cluster-type=
-        - --version=main
+        - --version=v0.47.0
         - --current-cluster=management-cluster
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:b6df4552f028ca1159b3ca81f475518d5bb1cd432100feace598e7910e5c4fc1
+        image: docker.io/projectsveltos/sveltos-agent@sha256:26cb4eaf0fbc11e04a6d68ddb0d79611b24e133c6e60664a06b756efa1b11699
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/agent/sveltos-agent-in-mgmt-cluster.yaml b/pkg/agent/sveltos-agent-in-mgmt-cluster.yaml
index a033207..46372b8 100644
--- a/pkg/agent/sveltos-agent-in-mgmt-cluster.yaml
+++ b/pkg/agent/sveltos-agent-in-mgmt-cluster.yaml
@@ -24,12 +24,12 @@ spec:
         - --cluster-namespace=
         - --cluster-name=
         - --cluster-type=
-        - --version=main
+        - --version=v0.47.0
         - --current-cluster=management-cluster
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:b6df4552f028ca1159b3ca81f475518d5bb1cd432100feace598e7910e5c4fc1
+        image: docker.io/projectsveltos/sveltos-agent@sha256:26cb4eaf0fbc11e04a6d68ddb0d79611b24e133c6e60664a06b756efa1b11699
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/agent/sveltos-agent.go b/pkg/agent/sveltos-agent.go
index 0dd64d6..0c2629e 100644
--- a/pkg/agent/sveltos-agent.go
+++ b/pkg/agent/sveltos-agent.go
@@ -193,12 +193,12 @@ spec:
         - --cluster-namespace=
         - --cluster-name=
         - --cluster-type=
-        - --version=main
+        - --version=v0.47.0
         - --current-cluster=managed-cluster
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:b6df4552f028ca1159b3ca81f475518d5bb1cd432100feace598e7910e5c4fc1
+        image: docker.io/projectsveltos/sveltos-agent@sha256:26cb4eaf0fbc11e04a6d68ddb0d79611b24e133c6e60664a06b756efa1b11699
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/agent/sveltos-agent.yaml b/pkg/agent/sveltos-agent.yaml
index ac3b6d9..07858da 100644
--- a/pkg/agent/sveltos-agent.yaml
+++ b/pkg/agent/sveltos-agent.yaml
@@ -175,12 +175,12 @@ spec:
         - --cluster-namespace=
         - --cluster-name=
         - --cluster-type=
-        - --version=main
+        - --version=v0.47.0
         - --current-cluster=managed-cluster
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:b6df4552f028ca1159b3ca81f475518d5bb1cd432100feace598e7910e5c4fc1
+        image: docker.io/projectsveltos/sveltos-agent@sha256:26cb4eaf0fbc11e04a6d68ddb0d79611b24e133c6e60664a06b756efa1b11699
         livenessProbe:
           failureThreshold: 3
           httpGet: