diff --git a/charts/team-ns/templates/tekton-tasks/kaniko.yaml b/charts/team-ns/templates/tekton-tasks/kaniko.yaml
index 038c14a9c3..dd9d3cfa68 100644
--- a/charts/team-ns/templates/tekton-tasks/kaniko.yaml
+++ b/charts/team-ns/templates/tekton-tasks/kaniko.yaml
@@ -79,4 +79,4 @@ spec:
       script: |
         set -e
         image="$(params.IMAGE)"
-        echo -n "${image}" | tee "$(results.IMAGE_URL.path)"
+        echo -n "${image}" | tee "$(results.IMAGE_URL.path)"
\ No newline at end of file
diff --git a/charts/tekton-pipelines/templates/deployment-tekton-events-controller.yaml b/charts/tekton-pipelines/templates/deployment-tekton-events-controller.yaml
index c0ba6d9112..26dead707d 100644
--- a/charts/tekton-pipelines/templates/deployment-tekton-events-controller.yaml
+++ b/charts/tekton-pipelines/templates/deployment-tekton-events-controller.yaml
@@ -63,13 +63,7 @@ spec:
         - name: tekton-events-controller
           image: {{ .Values.events.deployment.image }}
           args: []
-          resources:
-            requests:
-              cpu: 100m
-              memory: 100Mi
-            limits:
-              cpu: 1000m
-              memory: 1000Mi
+          resources: {{- toYaml .Values.events.resources | nindent 12 }}
           volumeMounts:
             - name: config-logging
               mountPath: /etc/config-logging
diff --git a/charts/tekton-pipelines/templates/deployment-tekton-pipelines-controller.yaml b/charts/tekton-pipelines/templates/deployment-tekton-pipelines-controller.yaml
index efb629cf72..6af4390c21 100644
--- a/charts/tekton-pipelines/templates/deployment-tekton-pipelines-controller.yaml
+++ b/charts/tekton-pipelines/templates/deployment-tekton-pipelines-controller.yaml
@@ -122,13 +122,7 @@ spec:
             runAsNonRoot: true
             seccompProfile:
               type: RuntimeDefault
-          resources:
-            requests:
-              cpu: 100m
-              memory: 100Mi
-            limits:
-              cpu: 1000m
-              memory: 1000Mi
+          resources: {{- toYaml .Values.controller.resources | nindent 12 }}
           ports:
             - name: metrics
               containerPort: 9090
diff --git a/charts/tekton-pipelines/templates/deployment-tekton-pipelines-remote-resolvers.yaml b/charts/tekton-pipelines/templates/deployment-tekton-pipelines-remote-resolvers.yaml
index fb542d5fe5..0fb2593252 100644
--- a/charts/tekton-pipelines/templates/deployment-tekton-pipelines-remote-resolvers.yaml
+++ b/charts/tekton-pipelines/templates/deployment-tekton-pipelines-remote-resolvers.yaml
@@ -64,13 +64,7 @@ spec:
       containers:
         - name: controller
           image: {{ .Values.remoteresolver.deployment.image }}
-          resources:
-            requests:
-              cpu: 100m
-              memory: 100Mi
-            limits:
-              cpu: 1000m
-              memory: 2Gi
+          resources: {{- toYaml .Values.remoteresolver.resources | nindent 12 }}
           ports:
             - name: metrics
               containerPort: 9090
diff --git a/charts/tekton-pipelines/templates/deployment-tekton-pipelines-webhook.yaml b/charts/tekton-pipelines/templates/deployment-tekton-pipelines-webhook.yaml
index ede6b365b7..a7faec3d7d 100644
--- a/charts/tekton-pipelines/templates/deployment-tekton-pipelines-webhook.yaml
+++ b/charts/tekton-pipelines/templates/deployment-tekton-pipelines-webhook.yaml
@@ -78,13 +78,7 @@ spec:
           # and substituted here.
           image: {{ .Values.webhook.deployment.image }}
           # Resource request required for autoscaler to take any action for a metric
-          resources:
-            requests:
-              cpu: 100m
-              memory: 100Mi
-            limits:
-              cpu: 500m
-              memory: 500Mi
+          resources: {{- toYaml .Values.webhook.resources | nindent 12 }}
           env:
             - name: SYSTEM_NAMESPACE
               valueFrom:
diff --git a/charts/tekton-pipelines/values.yaml b/charts/tekton-pipelines/values.yaml
index 66928a987e..399bca5a1d 100644
--- a/charts/tekton-pipelines/values.yaml
+++ b/charts/tekton-pipelines/values.yaml
@@ -48,6 +48,7 @@ webhook:
                   - windows
   tolerations: []
   nodeSelector: {}
+  resources: {}
 # Values to amend tekton-pipelines-remote-resolvers
 remoteresolver:
   deployment:
@@ -65,4 +66,5 @@ remoteresolver:
 
 events:
   deployment:
-    image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/events:v0.53.0@sha256:340e1edd0783bdb86e396ef53499f068a42da1986a1d806ab652b448869637bd
\ No newline at end of file
+    image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/events:v0.53.0@sha256:340e1edd0783bdb86e396ef53499f068a42da1986a1d806ab652b448869637bd
+  resources: {}
\ No newline at end of file
diff --git a/core.yaml b/core.yaml
index 1b5e675408..4c387fc995 100644
--- a/core.yaml
+++ b/core.yaml
@@ -3,6 +3,7 @@ k8s:
   namespaces:
     - name: argocd
       app: argocd
+      disableIstioInjection: true
     - name: cert-manager
       disableIstioInjection: true
     - name: cnpg-system
@@ -109,6 +110,7 @@ k8s:
     - name: velero
       app: velero
       disablePolicyChecks: true
+      disableIstioInjection: true
     - name: otomi-pipelines
       app: tekton
       disableIstioInjection: true
diff --git a/helmfile.d/snippets/defaults.yaml b/helmfile.d/snippets/defaults.yaml
index 71b827ab07..88c693416b 100644
--- a/helmfile.d/snippets/defaults.yaml
+++ b/helmfile.d/snippets/defaults.yaml
@@ -8,13 +8,6 @@ environments:
           alertmanager:
             enabled: false
             resources:
-              alertmanagerTeams:
-                requests:
-                  cpu: 10m
-                  memory: 64Mi
-                limits:
-                  cpu: 200m
-                  memory: 256Mi
               alertmanager:
                 requests:
                   cpu: 10m
@@ -27,11 +20,11 @@ environments:
             applicationSet:
               replicas: 1
             controller:
-              replicas: 1
+              replicas: 2
             autoscaling:
               repoServer:
                 enabled: true
-                minReplicas: 1
+                minReplicas: 2
                 maxReplicas: 5
                 targetCPUUtilizationPercentage: 80
                 targetMemoryUtilizationPercentage: 80
@@ -44,22 +37,22 @@ environments:
             resources:
               controller:
                 requests:
-                  cpu: 500m
-                  memory: 1Gi
+                  cpu: 200m
+                  memory: 512Mi
                 limits:
                   cpu: "2"
                   memory: 2Gi
               server:
                 requests:
                   cpu: 100m
-                  memory: 512M
+                  memory: 512Mi
                 limits:
                   cpu: "1"
                   memory: 1Gi
               repo:
                 requests:
                   cpu: 100m
-                  memory: 512M
+                  memory: 640Mi
                 limits:
                   cpu: "1"
                   memory: 1Gi
@@ -73,20 +66,20 @@ environments:
               applicationSet:
                 requests:
                   cpu: 100m
-                  memory: 256M
+                  memory: 256Mi
                 limits:
                   cpu: "1"
                   memory: 1Gi
               notifications:
                 requests:
                   cpu: 50m
-                  memory: 64M
+                  memory: 160Mi
                 limits:
                   cpu: "1"
                   memory: 1Gi
               imageUpdater:
                 requests:
-                  memory: 50Mi
+                  memory: 160Mi
                   cpu: 50m
                 limits:
                   memory: 1Gi
@@ -122,7 +115,7 @@ environments:
                   memory: 64Mi
                 limits:
                   cpu: 100m
-                  memory: 256Mi                              
+                  memory: 256Mi
             _rawValues: {}
           cnpg:
             resources:
@@ -148,7 +141,7 @@ environments:
                 memory: 128Mi
               requests:
                 memory: 64Mi
-                cpu: 10m  
+                cpu: 10m
           falco:
             enabled: false
             driver: ebpf
@@ -308,21 +301,21 @@ environments:
                   memory: 1Gi
                 requests:
                   cpu: 100m
-                  memory: 128Mi
+                  memory: 256Mi
               memcached:
                 limits:
                   cpu: 250m
                   memory: 256Mi
                 requests:
-                  cpu: 100m
+                  cpu: 10m
                   memory: 128Mi
               memcachedMetrics:
                 limits:
                   cpu: 200m
                   memory: 128M
                 requests:
-                  cpu: 50m
-                  memory: 64M
+                  cpu: 10m
+                  memory: 16M
               init:
                 limits:
                   cpu: 400m
@@ -340,13 +333,6 @@ environments:
                 limits:
                   cpu: "1"
                   memory: 1Gi
-              grafanaTeams:
-                requests:
-                  cpu: 10m
-                  memory: 128Mi
-                limits:
-                  cpu: "1"
-                  memory: 1Gi
               sidecar:
                 limits:
                   cpu: 500m
@@ -354,13 +340,6 @@ environments:
                 requests:
                   cpu: 10m
                   memory: 128Mi
-              sidecarTeams:
-                limits:
-                  cpu: 500m
-                  memory: 256Mi
-                requests:
-                  cpu: 10m
-                  memory: 128Mi
             _rawValues: {}
           harbor:
             enabled: false
@@ -372,49 +351,49 @@ environments:
             resources:
               chartmuseum:
                 requests:
-                  cpu: 10m
+                  cpu: 20m
                   memory: 56Mi
                 limits:
                   cpu: 500m
                   memory: 512Mi
               core:
                 requests:
-                  cpu: 10m
+                  cpu: 20m
                   memory: 128Mi
                 limits:
                   cpu: 500m
                   memory: 512Mi
               jobservice:
                 requests:
-                  cpu: 10m
-                  memory: 32Mi
+                  cpu: 20m
+                  memory: 128Mi
                 limits:
                   cpu: 500m
                   memory: 512Mi
               portal:
                 requests:
-                  cpu: 10m
-                  memory: 32Mi
+                  cpu: 20m
+                  memory: 128Mi
                 limits:
                   cpu: 500m
                   memory: 512Mi
               redis:
                 requests:
-                  cpu: 100m
+                  cpu: 20m
                   memory: 128Mi
                 limits:
                   cpu: 500m
                   memory: 512Mi
               registry:
                 requests:
-                  cpu: 10m
+                  cpu: 20m
                   memory: 32Mi
                 limits:
                   cpu: 500m
                   memory: 256Mi
               registryController:
                 requests:
-                  cpu: 10m
+                  cpu: 20m
                   memory: 32Mi
                 limits:
                   cpu: 500m
@@ -429,7 +408,7 @@ environments:
               nginx:
                 requests:
                   memory: 32Mi
-                  cpu: 10m
+                  cpu: 20m
                 limits:
                   memory: 512Mi
                   cpu: 200m
@@ -442,6 +421,8 @@ environments:
               enabled: true
               minReplicas: 2
               maxReplicas: 10
+              targetCPUUtilizationPercentage: 80
+              targetMemoryUtilizationPercentage: 80
             modsecurity:
               enabled: false
               block: false
@@ -455,7 +436,7 @@ environments:
               controller:
                 requests:
                   cpu: 100m
-                  memory: 256Mi
+                  memory: 384Mi
                 limits:
                   cpu: "2"
                   memory: 2Gi
@@ -491,9 +472,16 @@ environments:
             egressGateway:
               enabled: false
             resources:
-              proxy:
+              operator:
+                limits:
+                  cpu: 200m
+                  memory: 256Mi
                 requests:
                   cpu: 20m
+                  memory: 128Mi
+              proxy:
+                requests:
+                  cpu: 5m
                   memory: 80Mi
                 limits:
                   cpu: "1"
@@ -515,7 +503,7 @@ environments:
               pilot:
                 requests:
                   cpu: 100m
-                  memory: 128Mi
+                  memory: 192Mi
                 limits:
                   cpu: "2"
                   memory: 2Gi
@@ -526,31 +514,10 @@ environments:
               operator:
                 limits:
                   cpu: 500m
-                  memory: 128Mi
-                requests:
-                  cpu: 100m
-                  memory: 128Mi
-              agent:
-                limits:
-                  cpu: 100m
-                  memory: 128Mi
+                  memory: 1Gi
                 requests:
-                  cpu: 10m
-                  memory: 32Mi
-              collector:
-                limits:
                   cpu: 100m
                   memory: 128Mi
-                requests:
-                  cpu: 10m
-                  memory: 32Mi
-              ingester:
-                limits:
-                  cpu: 100m
-                  memory: 128Mi
-                requests:
-                  cpu: 10m
-                  memory: 32Mi
               jaeger:
                 limits:
                   cpu: "1"
@@ -565,18 +532,18 @@ environments:
             resources:
               keycloak:
                 requests:
-                  cpu: 200m
-                  memory: 512Mi
+                  cpu: 100m
+                  memory: 640Mi
                 limits:
                   cpu: "2"
                   memory: 2Gi
               operator:
                 requests:
                   cpu: 100m
-                  memory: 128Mi
+                  memory: 336Mi
                 limits:
                   cpu: "1"
-                  memory: 512Mi
+                  memory: 1Gi
             idp:
               alias: otomi-idp
               clientID: otomi
@@ -667,7 +634,21 @@ environments:
               pipelinesRemoteresolver:
                 requests:
                   cpu: 100m
-                  memory: 100Mi
+                  memory: 128Mi
+                limits:
+                  cpu: "1"
+                  memory: 1Gi
+              pipelinesEvents:
+                requests:
+                  cpu: 100m
+                  memory: 128Mi
+                limits:
+                  cpu: "1"
+                  memory: 1Gi
+              pipelinesWebhook:
+                requests:
+                  cpu: 100m
+                  memory: 144Mi
                 limits:
                   cpu: "1"
                   memory: 1Gi
@@ -720,7 +701,7 @@ environments:
               querier:
                 requests:
                   cpu: 50m
-                  memory: 64Mi
+                  memory: 144Mi
                 limits:
                   cpu: 200m
                   memory: 256Mi
@@ -744,7 +725,7 @@ environments:
                   memory: 32Mi
                 requests:
                   cpu: 50m
-                  memory: 16Mi                
+                  memory: 16Mi
             persistence:
               ingester:
                 size: 20Gi
@@ -894,7 +875,7 @@ environments:
                   memory: 128Mi
                 limits:
                   cpu: "1"
-                  memory: 512Mi
+                  memory: 1Gi
             _rawValues: {}
           apl-gitea-operator:
             resources:
@@ -904,7 +885,7 @@ environments:
                   memory: 128Mi
                 limits:
                   cpu: "1"
-                  memory: 512Mi
+                  memory: 1Gi
             _rawValues: {}
           apl-keycloak-operator:
             resources:
@@ -914,20 +895,35 @@ environments:
                   memory: 128Mi
                 limits:
                   cpu: "1"
-                  memory: 512Mi
+                  memory: 1Gi
             _rawValues: {}
           promtail:
             enabled: false
             resources:
               requests:
-                cpu: 200m
-                memory: 256Mi
+                cpu: 50m
+                memory: 160Mi
               limits:
                 cpu: "1"
-                memory: 512Mi
+                memory: 1Gi
             _rawValues: {}
           prometheus-blackbox-exporter:
             _rawValues: {}
+            resources:
+              blackboxExporter:
+                requests:
+                  cpu: 50m
+                  memory: 50Mi
+                limits:
+                  cpu: 250m
+                  memory: 300Mi
+              sentinel:
+                requests:
+                  cpu: 100m
+                  memory: 32Mi
+                limits:
+                  cpu: 200m
+                  memory: 128Mi
           prometheus:
             enabled: false
             disabledRules:
@@ -951,8 +947,8 @@ environments:
                   memory: 128Mi
               prometheus:
                 requests:
-                  cpu: 50m
-                  memory: 1Gi
+                  cpu: 100m
+                  memory: 2Gi
                 limits:
                   cpu: '3'
                   memory: 3Gi
@@ -972,15 +968,15 @@ environments:
                   memory: 256Mi
               thanosSidecar:
                 requests:
-                  cpu: 50m
+                  cpu: 10m
                   memory: 64Mi
                 limits:
                   cpu: "1"
-                  memory: 256Mi
+                  memory: 512Mi
               prometheusConfigReloader:
                 requests:
                   cpu: 10m
-                  memory: 32Mi
+                  memory: 24Mi
                 limits:
                   cpu: 100m
                   memory: 128Mi              
@@ -989,6 +985,11 @@ environments:
             enabled: false
             collector:
               mode: deployment
+              autoscaler:
+                minReplicas: 2
+                maxReplicas: 5
+                targetCPUUtilizationPercentage: 80
+                targetMemoryUtilizationPercentage: 80
               attributes:
                 - k8s.pod.name
                 - k8s.pod.uid
@@ -1001,24 +1002,24 @@ environments:
             resources:
               collector:
                 requests:
-                  cpu: 100m
-                  memory: 128Mi
+                  cpu: 50m
+                  memory: 256Mi
                 limits:
                   cpu: "1"
                   memory: 1Gi
               manager:
                 requests:
                   cpu: 50m
-                  memory: 32Mi
+                  memory: 64Mi
                 limits:
-                  cpu: 200m
+                  cpu: 500m
                   memory: 512Mi
               kubeRBACProxy:
                 requests:
                   cpu: 50m
-                  memory: 64Mi
+                  memory: 32Mi
                 limits:
-                  cpu: 500m
+                  cpu: 200m
                   memory: 128Mi
             _rawValues: {}
           sealed-secrets:
@@ -1089,7 +1090,7 @@ environments:
             autoscaling:
               ingester:
                 enabled: false
-                minReplicas: 1
+                minReplicas: 2
                 maxReplicas: 3
                 targetCPUUtilizationPercentage: 80
                 targetMemoryUtilizationPercentage: 80
@@ -1174,7 +1175,7 @@ environments:
               operator:
                 requests:
                   cpu: 10m
-                  memory: 256Mi
+                  memory: 512Mi
                 limits:
                   cpu: "1"
                   memory: 1Gi
@@ -1210,7 +1211,7 @@ environments:
                 memory: 1Gi
               requests:
                 cpu: 50m
-                memory: 128Mi
+                memory: 512Mi
           harbor:
             size: 5Gi
             replicas: 2
@@ -1221,7 +1222,7 @@ environments:
                 memory: 1Gi
               requests:
                 cpu: 50m
-                memory: 128Mi
+                memory: 256Mi
           gitea:
             useOtomiDB: true
             imported: false
@@ -1233,7 +1234,7 @@ environments:
                 memory: 1Gi
               requests:
                 cpu: 50m
-                memory: 128Mi
+                memory: 512Mi
         obj:
           provider:
             type: disabled
diff --git a/tests/fixtures/env/apps/ingress-nginx-platform.yaml b/tests/fixtures/env/apps/ingress-nginx-platform.yaml
index 18c71d4119..77c8fe44b3 100644
--- a/tests/fixtures/env/apps/ingress-nginx-platform.yaml
+++ b/tests/fixtures/env/apps/ingress-nginx-platform.yaml
@@ -19,3 +19,9 @@ apps:
                 requests:
                     cpu: 100m
                     memory: 192Mi
+        autoscaling:
+            enabled: true
+            maxReplicas: 10
+            minReplicas: 1
+            targetCPUUtilizationPercentage: 80
+            targetMemoryUtilizationPercentage: 80
diff --git a/tests/fixtures/env/apps/otel.yaml b/tests/fixtures/env/apps/otel.yaml
index 2b96e10e87..7182eb1c7e 100644
--- a/tests/fixtures/env/apps/otel.yaml
+++ b/tests/fixtures/env/apps/otel.yaml
@@ -3,13 +3,18 @@ apps:
         enabled: true
         collector:
             mode: deployment
-        attributes:
-            - k8s.pod.name
-            - k8s.pod.uid
-            - k8s.deployment.name
-            - k8s.namespace.name
-            - k8s.node.name
-            - k8s.pod.start_time
+            autoscaler:
+                minReplicas: 2
+                maxReplicas: 6
+                targetCPUUtilizationPercentage: 80
+                targetMemoryUtilizationPercentage: 80
+            attributes:
+                - k8s.pod.name
+                - k8s.pod.uid
+                - k8s.deployment.name
+                - k8s.namespace.name
+                - k8s.node.name
+                - k8s.pod.start_time
         operator:
             replicaCount: 1
         resources:
diff --git a/tests/fixtures/env/apps/prometheus-blackbox-exporter.yaml b/tests/fixtures/env/apps/prometheus-blackbox-exporter.yaml
new file mode 100644
index 0000000000..ba381353d7
--- /dev/null
+++ b/tests/fixtures/env/apps/prometheus-blackbox-exporter.yaml
@@ -0,0 +1,18 @@
+apps:
+    prometheus-blackbox-exporter:
+        _rawValues: {}
+        resources:
+            blackboxExporter:
+                requests:
+                    cpu: 50m
+                    memory: 50Mi
+                limits:
+                    cpu: 250m
+                    memory: 300Mi
+            sentinel:
+                requests:
+                    cpu: 100m
+                    memory: 32Mi
+                limits:
+                    cpu: 200m
+                    memory: 128Mi
diff --git a/values-changes.yaml b/values-changes.yaml
index 69e6402376..039c2be945 100644
--- a/values-changes.yaml
+++ b/values-changes.yaml
@@ -302,6 +302,12 @@ changes:
     deletions:
       - 'teamConfig.{team}.managedMonitoring.prometheus'
       - 'apps.grafana.resources.downloadDashboards'
+      - 'apps.grafana.resources.grafanaTeams'
+      - 'apps.grafana.resources.sidecarTeams'
+      - 'apps.alertmanger.resources.alertmanagerTeams'
+      - 'apps.jaeger.ingester'
+      - 'apps.jaeger.collector'
+      - 'apps.jaeger.agent'
   - version: 30
     relocations:
       - 'oidc.adminGroupID': 'oidc.platformAdminGroupID'
diff --git a/values-schema.yaml b/values-schema.yaml
index 47292a0c09..c8aba0bb8c 100644
--- a/values-schema.yaml
+++ b/values-schema.yaml
@@ -427,7 +427,23 @@ definitions:
             type: string
             default: '0.01'
       autoscaling:
-        $ref: '#/definitions/autoscalingEnabled'
+        additionalProperties: false
+        properties:
+          enabled:
+            default: true
+            type: boolean
+          maxReplicas:
+            type: integer
+            default: 10
+          minReplicas:
+            type: integer
+            default: 1
+          targetCPUUtilizationPercentage:
+            type: integer
+            default: 80
+          targetMemoryUtilizationPercentage:
+            type: integer
+            default: 80
       maxBodySize:
         type: string
         default: 1024m
@@ -1498,8 +1514,6 @@ properties:
             $ref: '#/definitions/imageSimple'
           resources:
             properties:
-              alertmanagerTeams:
-                $ref: '#/definitions/resources'
               alertmanger:
                 $ref: '#/definitions/resources'
       argocd:
@@ -1824,10 +1838,6 @@ properties:
               $ref: '#/definitions/resources'
             sidecar:
               $ref: '#/definitions/resources'
-            grafanaTeams:
-              $ref: '#/definitions/resources'
-            sidecarTeams:
-              $ref: '#/definitions/resources'
       harbor:
         additionalProperties: false
         properties:
@@ -1968,6 +1978,8 @@ properties:
                 $ref: '#/definitions/resources'
               proxy:
                 $ref: '#/definitions/resources'
+              operator:
+                $ref: '#/definitions/resources'
       jaeger:
         additionalProperties: false
         properties:
@@ -1977,12 +1989,6 @@ properties:
           resources:
             operator:
               $ref: '#/definitions/resources'
-            agent:
-              $ref: '#/definitions/resources'
-            collector:
-              $ref: '#/definitions/resources'
-            ingester:
-              $ref: '#/definitions/resources'
             jaeger:
               $ref: '#/definitions/resources'
           _rawValues:
@@ -2162,6 +2168,10 @@ properties:
                 $ref: '#/definitions/resources'
               pipelinesRemoteresolver:
                 $ref: '#/definitions/resources'
+              pipelinesEvents:
+                $ref: '#/definitions/resources'
+              pipelinesWebhook:
+                $ref: '#/definitions/resources'
               triggersInterceptors:
                 $ref: '#/definitions/resources'
               triggersController:
@@ -2615,6 +2625,20 @@ properties:
                   - deployment
                   - daemonset
                   - statefulset
+              autoscaler:
+                properties:
+                  maxReplicas:
+                    type: integer
+                    default: 5
+                  minReplicas:
+                    type: integer
+                    default: 2
+                  targetCPUUtilizationPercentage:
+                    type: integer
+                    default: 80
+                  targetMemoryUtilizationPercentage:
+                    type: integer
+                    default: 80
               attributes:
                 type: array
                 title: Kubernetes Attributes
diff --git a/values/argocd/argocd.gotmpl b/values/argocd/argocd.gotmpl
index def02851e6..f50c74403d 100644
--- a/values/argocd/argocd.gotmpl
+++ b/values/argocd/argocd.gotmpl
@@ -11,7 +11,7 @@ global:
   {{- end }}
 # ApplicationSet Controller
 applicationSet:
-  replicas: {{ $a.applicationSet.replicas }} 
+  replicas: {{ $a.applicationSet.replicas }}
   resources: {{- $a.resources.applicationSet | toYaml | nindent 4 }}
   metrics:
     enabled: true
@@ -22,7 +22,7 @@ applicationSet:
 
 # Application Controller
 controller:
-  replicas: {{ $a.controller.replicas }} 
+  replicas: {{ $a.controller.replicas }}
   resources: {{- $a.resources.controller | toYaml | nindent 4 }}
   metrics:
     enabled: true
diff --git a/values/ingress-nginx/ingress-nginx.gotmpl b/values/ingress-nginx/ingress-nginx.gotmpl
index 07be08ea5a..7d5f2f69c6 100644
--- a/values/ingress-nginx/ingress-nginx.gotmpl
+++ b/values/ingress-nginx/ingress-nginx.gotmpl
@@ -43,8 +43,8 @@ controller:
     enabled: {{ $n.autoscaling.enabled }}
     minReplicas: {{ $n.autoscaling.minReplicas }}
     maxReplicas: {{ $n.autoscaling.maxReplicas }}
-    targetCPUUtilizationPercentage: 60
-    targetMemoryUtilizationPercentage: 75
+    targetCPUUtilizationPercentage: {{ $n.autoscaling.targetCPUUtilizationPercentage }}
+    targetMemoryUtilizationPercentage: {{ $n.autoscaling.targetMemoryUtilizationPercentage }}
   priorityClassName: otomi-critical
   extraArgs:
     v: 3
diff --git a/values/istio-operator/istio-operator.gotmpl b/values/istio-operator/istio-operator.gotmpl
index 9abfec6278..9394893298 100644
--- a/values/istio-operator/istio-operator.gotmpl
+++ b/values/istio-operator/istio-operator.gotmpl
@@ -5,6 +5,9 @@ hub: istio
 
 operatorNamespace: istio-operator
 
+operator:
+  resources: {{- $i.resources.operator | toYaml | nindent 6 }}
+
 {{- with .Values.otomi | get "globalPullSecret" nil }}
 imagePullSecrets:
   - otomi-pullsecret-global
diff --git a/values/jaeger-operator/jaeger-operator.gotmpl b/values/jaeger-operator/jaeger-operator.gotmpl
index a4612777a9..7348a3f80d 100644
--- a/values/jaeger-operator/jaeger-operator.gotmpl
+++ b/values/jaeger-operator/jaeger-operator.gotmpl
@@ -10,26 +10,8 @@ jaeger:
       options:
         query:
           base-path: /jaeger
-    agent:
-      resources: {{- $j.resources.agent | toYaml | nindent 8 }}
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
-      sidecarSecurityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
     annotations:
       sidecar.istio.io/inject: "true"
-    collector:
-      resources: {{- $j.resources.collector | toYaml | nindent 8 }}
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
-    ingester:
-      resources: {{- $j.resources.ingester | toYaml | nindent 8 }}
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
     ingress:
       enabled: false
     resources: {{- $j.resources.jaeger | toYaml | nindent 6 }}
diff --git a/values/otel-operator/otel-operator-raw.gotmpl b/values/otel-operator/otel-operator-raw.gotmpl
index da7201e1e5..fcadfdae5a 100644
--- a/values/otel-operator/otel-operator-raw.gotmpl
+++ b/values/otel-operator/otel-operator-raw.gotmpl
@@ -74,6 +74,11 @@ resources:
               - jaeger
               {{- end }}
       mode: {{ $o.collector.mode }}
+      autoscaler:
+        minReplicas: {{ $o.collector.autoscaler.minReplicas }}
+        maxReplicas: {{ $o.collector.autoscaler.maxReplicas }}
+        targetCPUUtilization: {{ $o.collector.autoscaler.targetCPUUtilizationPercentage }}
+        targetMemoryUtilization: {{ $o.collector.autoscaler.targetMemoryUtilizationPercentage }}
       resources: {{- $o.resources.collector | toYaml | nindent 8 }}
   - apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRole
diff --git a/values/prometheus-blackbox-exporter/prometheus-blackbox-exporter.gotmpl b/values/prometheus-blackbox-exporter/prometheus-blackbox-exporter.gotmpl
index c5ef5ed8ee..7e4d500d6a 100644
--- a/values/prometheus-blackbox-exporter/prometheus-blackbox-exporter.gotmpl
+++ b/values/prometheus-blackbox-exporter/prometheus-blackbox-exporter.gotmpl
@@ -7,22 +7,10 @@ persistence:
   size: 1Gi
 usePassword: false
 
-resources:
-  requests:
-    cpu: 50m
-    memory: 50Mi
-  limits:
-    cpu: 250m
-    memory: 300Mi
+resources: {{- $pbe.resources.blackboxExporter | toYaml | nindent 4 }}
 
 sentinel:
-  resources:
-    requests:
-      cpu: 100m
-      memory: 32Mi
-    limits:
-      cpu: 200m
-      memory: 128Mi
+  resources: {{- $pbe.resources.sentinel | toYaml | nindent 6 }}
 
 config:
   modules:
diff --git a/values/prometheus-operator/prometheus-operator-team.gotmpl b/values/prometheus-operator/prometheus-operator-team.gotmpl
index 2e296cfc73..a45ee96967 100644
--- a/values/prometheus-operator/prometheus-operator-team.gotmpl
+++ b/values/prometheus-operator/prometheus-operator-team.gotmpl
@@ -59,12 +59,36 @@ grafana:
     enabled: false
   defaultDashboardsEnabled: false
   plugins: []
-  resources: {{- $g.resources.grafanaTeams | toYaml | nindent 4 }}
+  resources:
+    requests:
+      cpu: 10m
+      memory: 128Mi
+    limits:
+      cpu: "1"
+      memory: 1Gi
   sidecar: 
-    resources: {{- $g.resources.sidecarTeams | toYaml | nindent 6 }}
+    resources:
+      limits:
+        cpu: 500m
+        memory: 256Mi
+      requests:
+        cpu: 10m
+        memory: 128Mi
 
 alertmanager:
   serviceMonitor:
     selfMonitor: false
   alertmanagerSpec:
-    resources: {{- $a.resources.alertmanagerTeams | toYaml | nindent 6 }}
+    resources:
+      requests:
+        cpu: 10m
+        memory: 64Mi
+      limits:
+        cpu: 200m
+        memory: 256Mi
+
+prometheus:
+  thanosService:
+    enabled: false
+  thanosServiceMonitor:
+    enabled: false
\ No newline at end of file
diff --git a/values/tekton-pipelines/tekton-pipelines.gotmpl b/values/tekton-pipelines/tekton-pipelines.gotmpl
index 911e033d4b..e1dd749abc 100644
--- a/values/tekton-pipelines/tekton-pipelines.gotmpl
+++ b/values/tekton-pipelines/tekton-pipelines.gotmpl
@@ -5,4 +5,10 @@ controller:
   resources: {{- $t.resources.pipelinesController | toYaml | nindent 4 }}
 
 remoteresolver:
-  resources: {{- $t.resources.pipelinesRemoteresolver | toYaml | nindent 4 }}
\ No newline at end of file
+  resources: {{- $t.resources.pipelinesRemoteresolver | toYaml | nindent 4 }}
+
+events:
+  resources: {{- $t.resources.pipelinesEvents | toYaml | nindent 4 }}
+
+webhook:
+  resources: {{- $t.resources.pipelinesWebhook | toYaml | nindent 4 }}
\ No newline at end of file
diff --git a/values/tempo/tempo.gotmpl b/values/tempo/tempo.gotmpl
index 943ac0f66a..ea8e8ca120 100644
--- a/values/tempo/tempo.gotmpl
+++ b/values/tempo/tempo.gotmpl
@@ -6,6 +6,7 @@
 fullnameOverride: tempo
 
 ingester:
+  replicas: {{ $t.autoscaling.ingester.minReplicas }}
   resources: {{- $t.resources.ingester | toYaml | nindent 4 }}
   autoscaling:
     enabled: {{ $t.autoscaling.ingester.enabled }}
@@ -21,6 +22,7 @@ ingester:
   {{- end }}
 
 distributor:
+  replicas: {{ $t.autoscaling.distributor.minReplicas }}
   resources: {{- $t.resources.distributor | toYaml | nindent 4 }}
   autoscaling:
     enabled: {{ $t.autoscaling.distributor.enabled }}
@@ -38,6 +40,7 @@ compactor:
   resources: {{- $t.resources.compactor | toYaml | nindent 4 }}
 
 querier:
+  replicas: {{ $t.autoscaling.querier.minReplicas }}
   resources: {{- $t.resources.querier | toYaml | nindent 4 }}
   autoscaling:
     enabled: {{ $t.autoscaling.querier.enabled }}
@@ -47,6 +50,7 @@ querier:
     targetMemoryUtilizationPercentage: {{ $t.autoscaling.querier.targetMemoryUtilizationPercentage }}
 
 queryFrontend:
+  replicas: {{ $t.autoscaling.queryFrontend.minReplicas }}
   resources: {{- $t.resources.queryFrontend | toYaml | nindent 4 }}
   autoscaling:
     enabled: {{ $t.autoscaling.queryFrontend.enabled }}