diff --git a/cli/cmd/resources/autoscaler.go b/cli/cmd/resources/autoscaler.go
index a0047fa40..69c1aa99c 100644
--- a/cli/cmd/resources/autoscaler.go
+++ b/cli/cmd/resources/autoscaler.go
@@ -467,7 +467,7 @@ func NewAutoscalerDeployment(ns string, version string, imagePrefix string, imag
 							Resources: corev1.ResourceRequirements{
 								Limits: corev1.ResourceList{
 									"cpu":    resource.MustParse("500m"),
-									"memory": *resource.NewQuantity(134217728, resource.BinarySI),
+									"memory": *resource.NewQuantity(536870912, resource.BinarySI),
 								},
 								Requests: corev1.ResourceList{
 									"cpu":    resource.MustParse("10m"),
diff --git a/cli/cmd/resources/instrumentor.go b/cli/cmd/resources/instrumentor.go
index 358a18c6a..238363e0b 100644
--- a/cli/cmd/resources/instrumentor.go
+++ b/cli/cmd/resources/instrumentor.go
@@ -501,7 +501,7 @@ func NewInstrumentorDeployment(ns string, version string, telemetryEnabled bool,
 							Resources: corev1.ResourceRequirements{
 								Limits: corev1.ResourceList{
 									"cpu":    resource.MustParse("500m"),
-									"memory": *resource.NewQuantity(134217728, resource.BinarySI),
+									"memory": *resource.NewQuantity(536870912, resource.BinarySI),
 								},
 								Requests: corev1.ResourceList{
 									"cpu":    resource.MustParse("10m"),
diff --git a/cli/cmd/resources/scheduler.go b/cli/cmd/resources/scheduler.go
index 6cdf42be5..2b8bbc35f 100644
--- a/cli/cmd/resources/scheduler.go
+++ b/cli/cmd/resources/scheduler.go
@@ -259,7 +259,7 @@ func NewSchedulerDeployment(ns string, version string, imagePrefix string) *apps
 							Resources: corev1.ResourceRequirements{
 								Limits: corev1.ResourceList{
 									"cpu":    resource.MustParse("500m"),
-									"memory": *resource.NewQuantity(134217728, resource.BinarySI),
+									"memory": *resource.NewQuantity(536870912, resource.BinarySI),
 								},
 								Requests: corev1.ResourceList{
 									"cpu":    resource.MustParse("10m"),
diff --git a/cli/cmd/resources/ui.go b/cli/cmd/resources/ui.go
index dbd8bc6e6..6cd464c23 100644
--- a/cli/cmd/resources/ui.go
+++ b/cli/cmd/resources/ui.go
@@ -94,7 +94,7 @@ func NewUIDeployment(ns string, version string, imagePrefix string) *appsv1.Depl
 							Resources: corev1.ResourceRequirements{
 								Limits: corev1.ResourceList{
 									"cpu":    resource.MustParse("500m"),
-									"memory": *resource.NewQuantity(134217728, resource.BinarySI),
+									"memory": *resource.NewQuantity(536870912, resource.BinarySI),
 								},
 								Requests: corev1.ResourceList{
 									"cpu":    resource.MustParse("10m"),
diff --git a/helm/odigos/templates/autoscaler/deployment.yaml b/helm/odigos/templates/autoscaler/deployment.yaml
index 93e424262..f7ccf419e 100644
--- a/helm/odigos/templates/autoscaler/deployment.yaml
+++ b/helm/odigos/templates/autoscaler/deployment.yaml
@@ -55,7 +55,7 @@ spec:
         resources:
           limits:
             cpu: 500m
-            memory: 128Mi
+            memory: 512Mi
           requests:
             cpu: 10m
             memory: 64Mi
diff --git a/helm/odigos/templates/instrumentor/deployment.yaml b/helm/odigos/templates/instrumentor/deployment.yaml
index 6093737de..43c106181 100644
--- a/helm/odigos/templates/instrumentor/deployment.yaml
+++ b/helm/odigos/templates/instrumentor/deployment.yaml
@@ -58,7 +58,7 @@ spec:
         resources:
           limits:
             cpu: 500m
-            memory: 128Mi
+            memory: 512Mi
           requests:
             cpu: 10m
             memory: 64Mi
diff --git a/helm/odigos/templates/scheduler/deployment.yaml b/helm/odigos/templates/scheduler/deployment.yaml
index b238f3876..081d8d6e6 100644
--- a/helm/odigos/templates/scheduler/deployment.yaml
+++ b/helm/odigos/templates/scheduler/deployment.yaml
@@ -50,7 +50,7 @@ spec:
         resources:
           limits:
             cpu: 500m
-            memory: 128Mi
+            memory: 512Mi
           requests:
             cpu: 10m
             memory: 64Mi
diff --git a/helm/odigos/templates/ui/deployment.yaml b/helm/odigos/templates/ui/deployment.yaml
index b071a7103..12a363e85 100644
--- a/helm/odigos/templates/ui/deployment.yaml
+++ b/helm/odigos/templates/ui/deployment.yaml
@@ -38,7 +38,7 @@ spec:
         resources:
           limits:
             cpu: 500m
-            memory: 128Mi
+            memory: 512Mi
           requests:
             cpu: 10m
             memory: 64Mi
diff --git a/instrumentor/controllers/startlangdetection/manager.go b/instrumentor/controllers/startlangdetection/manager.go
index 16b90af9c..e39e88ad7 100644
--- a/instrumentor/controllers/startlangdetection/manager.go
+++ b/instrumentor/controllers/startlangdetection/manager.go
@@ -1,6 +1,7 @@
 package startlangdetection
 
 import (
+	"github.com/odigos-io/odigos/instrumentor/controllers/utils"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -59,18 +60,18 @@ func SetupWithManager(mgr ctrl.Manager) error {
 		return err
 	}
 
-	//err = builder.
-	//	ControllerManagedBy(mgr).
-	//	Named("startlangdetection-configmaps").
-	//	For(&corev1.ConfigMap{}).
-	//	WithEventFilter(&utils.OnlyUpdatesPredicate{}).
-	//	Complete(&OdigosConfigReconciler{
-	//		Client: mgr.GetClient(),
-	//		Scheme: mgr.GetScheme(),
-	//	})
-	//if err != nil {
-	//	return err
-	//}
+	err = builder.
+		ControllerManagedBy(mgr).
+		Named("startlangdetection-configmaps").
+		For(&corev1.ConfigMap{}).
+		WithEventFilter(&utils.OnlyUpdatesPredicate{}).
+		Complete(&OdigosConfigReconciler{
+			Client: mgr.GetClient(),
+			Scheme: mgr.GetScheme(),
+		})
+	if err != nil {
+		return err
+	}
 
 	return nil
 }
diff --git a/instrumentor/main.go b/instrumentor/main.go
index 78624851d..67a9494b9 100644
--- a/instrumentor/main.go
+++ b/instrumentor/main.go
@@ -20,6 +20,8 @@ import (
 	"flag"
 	"os"
 
+	"github.com/odigos-io/odigos/k8sutils/pkg/env"
+
 	"github.com/odigos-io/odigos/instrumentor/controllers/instrumentationconfig"
 	"github.com/odigos-io/odigos/instrumentor/controllers/startlangdetection"
 
@@ -172,6 +174,9 @@ func main() {
 				&corev1.Namespace{}: {
 					Label: labels.Set{consts.OdigosInstrumentationLabel: consts.InstrumentationEnabled}.AsSelector(),
 				},
+				&corev1.ConfigMap{}: {
+					Field: client.InNamespace(env.GetCurrentNamespace()).AsSelector(),
+				},
 			},
 		},
 	}