diff --git a/Makefile b/Makefile
index 34cd4b8..dbd9f7e 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 ?= v1.3.0
+TAG ?= main
 
 ## Tool Binaries
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
index 509c9cc..52364c9 100644
--- a/config/default/manager_auth_proxy_patch.yaml
+++ b/config/default/manager_auth_proxy_patch.yaml
@@ -16,6 +16,6 @@ spec:
         - "--shard-key="
         - --capi-onboard-annotation=
         - "--v=5"
-        - "--version=v1.3.0"
+        - "--version=main"
         - "--registry="
         - "--agent-in-mgmt-cluster=false"
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
index b64d172..e82c105 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:v1.3.0
+      - image: docker.io/projectsveltos/classifier:main
         name: manager
diff --git a/manifest/deployment-agentless.yaml b/manifest/deployment-agentless.yaml
index 3e18836..b26c4e5 100644
--- a/manifest/deployment-agentless.yaml
+++ b/manifest/deployment-agentless.yaml
@@ -24,12 +24,12 @@ spec:
         - --shard-key=
         - --capi-onboard-annotation=
         - --v=5
-        - --version=v1.3.0
+        - --version=main
         - --registry=
         - --agent-in-mgmt-cluster=true
         command:
         - /manager
-        image: docker.io/projectsveltos/classifier:v1.3.0
+        image: docker.io/projectsveltos/classifier:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/manifest/deployment-shard.yaml b/manifest/deployment-shard.yaml
index 8c4974b..982b6af 100644
--- a/manifest/deployment-shard.yaml
+++ b/manifest/deployment-shard.yaml
@@ -24,12 +24,12 @@ spec:
         - --shard-key={{.SHARD}}
         - --capi-onboard-annotation=
         - --v=5
-        - --version=v1.3.0
+        - --version=main
         - --registry=
         - --agent-in-mgmt-cluster=false
         command:
         - /manager
-        image: docker.io/projectsveltos/classifier:v1.3.0
+        image: docker.io/projectsveltos/classifier:main
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
index a096c3c..fe26e2f 100644
--- a/manifest/manifest.yaml
+++ b/manifest/manifest.yaml
@@ -170,12 +170,12 @@ spec:
         - --shard-key=
         - --capi-onboard-annotation=
         - --v=5
-        - --version=v1.3.0
+        - --version=main
         - --registry=
         - --agent-in-mgmt-cluster=false
         command:
         - /manager
-        image: docker.io/projectsveltos/classifier:v1.3.0
+        image: docker.io/projectsveltos/classifier:main
         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 8be6496..269a881 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=v1.3.0
+        - --version=main
         - --current-cluster=management-cluster
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:7eafa77a1a470748b1f99c3ac766330e23a1439f59ac09f856c7bfb0ebf7fbb3
+        image: docker.io/projectsveltos/sveltos-agent@sha256:a619d423001dd8e50797bdbb01e0a5fb4478e130e689e42d78f87f43bcbd0416
         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 3800ad2..2bf686b 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=v1.3.0
+        - --version=main
         - --current-cluster=management-cluster
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:7eafa77a1a470748b1f99c3ac766330e23a1439f59ac09f856c7bfb0ebf7fbb3
+        image: docker.io/projectsveltos/sveltos-agent@sha256:a619d423001dd8e50797bdbb01e0a5fb4478e130e689e42d78f87f43bcbd0416
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/agent/sveltos-agent.go b/pkg/agent/sveltos-agent.go
index 59ce06c..015d423 100644
--- a/pkg/agent/sveltos-agent.go
+++ b/pkg/agent/sveltos-agent.go
@@ -201,12 +201,12 @@ spec:
         - --cluster-namespace=
         - --cluster-name=
         - --cluster-type=
-        - --version=v1.3.0
+        - --version=main
         - --current-cluster=managed-cluster
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:7eafa77a1a470748b1f99c3ac766330e23a1439f59ac09f856c7bfb0ebf7fbb3
+        image: docker.io/projectsveltos/sveltos-agent@sha256:a619d423001dd8e50797bdbb01e0a5fb4478e130e689e42d78f87f43bcbd0416
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/agent/sveltos-agent.yaml b/pkg/agent/sveltos-agent.yaml
index e3a0897..f6daca2 100644
--- a/pkg/agent/sveltos-agent.yaml
+++ b/pkg/agent/sveltos-agent.yaml
@@ -183,12 +183,12 @@ spec:
         - --cluster-namespace=
         - --cluster-name=
         - --cluster-type=
-        - --version=v1.3.0
+        - --version=main
         - --current-cluster=managed-cluster
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:7eafa77a1a470748b1f99c3ac766330e23a1439f59ac09f856c7bfb0ebf7fbb3
+        image: docker.io/projectsveltos/sveltos-agent@sha256:a619d423001dd8e50797bdbb01e0a5fb4478e130e689e42d78f87f43bcbd0416
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/pkg/agent/sveltos-applier.go b/pkg/agent/sveltos-applier.go
index d2aed8a..7e0ccc6 100644
--- a/pkg/agent/sveltos-applier.go
+++ b/pkg/agent/sveltos-applier.go
@@ -101,7 +101,7 @@ spec:
         - --cluster-type=
         - --secret-with-kubeconfig=
         - --v=5
-        - --version=v1.3.0
+        - --version=main
         command:
         - /manager
         env:
diff --git a/pkg/agent/sveltos-applier.yaml b/pkg/agent/sveltos-applier.yaml
index 2387b1c..0fbf979 100644
--- a/pkg/agent/sveltos-applier.yaml
+++ b/pkg/agent/sveltos-applier.yaml
@@ -83,7 +83,7 @@ spec:
         - --cluster-type=
         - --secret-with-kubeconfig=
         - --v=5
-        - --version=v1.3.0
+        - --version=main
         command:
         - /manager
         env: