diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index ff4fdb7..b30b8b8 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -54,8 +54,6 @@ rules:
   - cluster.x-k8s.io
   resources:
   - clusters/status
-  - machines
-  - machines/status
   verbs:
   - get
   - list
diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
index fe26e2f..0c39337 100644
--- a/manifest/manifest.yaml
+++ b/manifest/manifest.yaml
@@ -64,8 +64,6 @@ rules:
   - cluster.x-k8s.io
   resources:
   - clusters/status
-  - machines
-  - machines/status
   verbs:
   - get
   - list
diff --git a/pkg/agent/sveltos-agent-in-mgmt-cluster.go b/pkg/agent/sveltos-agent-in-mgmt-cluster.go
index 9c6e25f..2613a25 100644
--- a/pkg/agent/sveltos-agent-in-mgmt-cluster.go
+++ b/pkg/agent/sveltos-agent-in-mgmt-cluster.go
@@ -47,7 +47,16 @@ spec:
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:37a6846b7842f614c88757c990ab1a66af9e7ec20add0714c9ef17430b072dd8
+        env:
+        - name: GOMEMLIMIT
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.memory
+        - name: GOMAXPROCS
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.cpu
+        image: docker.io/projectsveltos/sveltos-agent@sha256:16558c3c888196115e4f1153f6c4ad07ef16b79d86ee3aba19d66a2d71bed73c
         livenessProbe:
           failureThreshold: 3
           httpGet:
@@ -77,7 +86,7 @@ spec:
             cpu: 500m
             memory: 512Mi
           requests:
-            cpu: 10m
+            cpu: 100m
             memory: 128Mi
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/pkg/agent/sveltos-agent-in-mgmt-cluster.yaml b/pkg/agent/sveltos-agent-in-mgmt-cluster.yaml
index dcc2e12..b9c72b1 100644
--- a/pkg/agent/sveltos-agent-in-mgmt-cluster.yaml
+++ b/pkg/agent/sveltos-agent-in-mgmt-cluster.yaml
@@ -29,7 +29,16 @@ spec:
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:37a6846b7842f614c88757c990ab1a66af9e7ec20add0714c9ef17430b072dd8
+        env:
+        - name: GOMEMLIMIT
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.memory
+        - name: GOMAXPROCS
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.cpu
+        image: docker.io/projectsveltos/sveltos-agent@sha256:16558c3c888196115e4f1153f6c4ad07ef16b79d86ee3aba19d66a2d71bed73c
         livenessProbe:
           failureThreshold: 3
           httpGet:
@@ -59,7 +68,7 @@ spec:
             cpu: 500m
             memory: 512Mi
           requests:
-            cpu: 10m
+            cpu: 100m
             memory: 128Mi
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/pkg/agent/sveltos-agent.go b/pkg/agent/sveltos-agent.go
index c112763..afbb2bf 100644
--- a/pkg/agent/sveltos-agent.go
+++ b/pkg/agent/sveltos-agent.go
@@ -206,7 +206,16 @@ spec:
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:37a6846b7842f614c88757c990ab1a66af9e7ec20add0714c9ef17430b072dd8
+        env:
+        - name: TOTAL_MEMORY_LIMIT
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.memory
+        - name: GOMAXPROCS
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.cpu
+        image: docker.io/projectsveltos/sveltos-agent@sha256:16558c3c888196115e4f1153f6c4ad07ef16b79d86ee3aba19d66a2d71bed73c
         livenessProbe:
           failureThreshold: 3
           httpGet:
@@ -236,7 +245,7 @@ spec:
             cpu: 500m
             memory: 512Mi
           requests:
-            cpu: 10m
+            cpu: 100m
             memory: 128Mi
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/pkg/agent/sveltos-agent.yaml b/pkg/agent/sveltos-agent.yaml
index 63f3fca..38b76be 100644
--- a/pkg/agent/sveltos-agent.yaml
+++ b/pkg/agent/sveltos-agent.yaml
@@ -188,7 +188,16 @@ spec:
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:37a6846b7842f614c88757c990ab1a66af9e7ec20add0714c9ef17430b072dd8
+        env:
+        - name: TOTAL_MEMORY_LIMIT
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.memory
+        - name: GOMAXPROCS
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.cpu
+        image: docker.io/projectsveltos/sveltos-agent@sha256:16558c3c888196115e4f1153f6c4ad07ef16b79d86ee3aba19d66a2d71bed73c
         livenessProbe:
           failureThreshold: 3
           httpGet:
@@ -218,7 +227,7 @@ spec:
             cpu: 500m
             memory: 512Mi
           requests:
-            cpu: 10m
+            cpu: 100m
             memory: 128Mi
         securityContext:
           allowPrivilegeEscalation: false