[COMMON] Harmonize resource settings, Part 2

Some settings are still wrongly interpreted (e.g. 0.02Gi)
Therefor they are changed to non-floating numbers (e.g. 20Mi)

Issue-ID: OOM-3273

Change-Id: Icc88dead1ac5b1df8629d6adcc438a739e20522e
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>

109 files changed, 247 insertions, 247 deletions

diff --git a/kubernetes/a1policymanagement/values.yaml b/kubernetes/a1policymanagement/values.yaml
index 026b67e0ce..9ae6b60626 100644
--- a/kubernetes/a1policymanagement/values.yaml
+++ b/kubernetes/a1policymanagement/values.yaml
@@ -93,10 +93,10 @@ resources:
   small:
     limits:
       cpu: "2"
-      memory: "0.6Gi"
+      memory: "600Mi"
     requests:
       cpu: "1"
-      memory: "0.3Gi"
+      memory: "300Mi"
   large:
     limits:
       cpu: "4"
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index 234718c3ac..1f666ddfcd 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -102,10 +102,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       {{  end  }}
       containers:
       - name: {{ include "common.name" . }}
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
index a36d90407e..7d73876d16 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
@@ -77,10 +77,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       {{- end }}
       containers:
       - name: {{ include "common.name" . }}-db-backup-job
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
index 7d2504e108..ac40f095cb 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
@@ -78,10 +78,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
index 6310f9e0ce..6b7f89f733 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
@@ -83,10 +83,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       - command:
         - sh
         args:
@@ -238,10 +238,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       {{- end }}
       containers:
       - name: {{ include "common.name" . }}-db-backup-job
diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
index edf63c5eba..1e2880d529 100644
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -126,10 +126,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
index d9558370d0..1685bc5001 100644
--- a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
@@ -51,10 +51,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
index 3171d4c534..d6e49acc4b 100644
--- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
@@ -145,10 +145,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/aai/components/aai-traversal/templates/job.yaml b/kubernetes/aai/components/aai-traversal/templates/job.yaml
index 2d7daf1414..ae8bd85a37 100644
--- a/kubernetes/aai/components/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/job.yaml
@@ -61,10 +61,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index ddb018e793..395d8d6b17 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -332,7 +332,7 @@ haproxy:
   initContainers:
     resources:
       cpu: "50m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   requestBlocking:
     enabled: false
     customConfigs: []
diff --git a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
index f7a9c9ca1d..fb728a37fc 100755
--- a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
@@ -47,10 +47,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/cds/components/cds-command-executor/values.yaml b/kubernetes/cds/components/cds-command-executor/values.yaml
index 2af68e60a4..e517d8bdbf 100755
--- a/kubernetes/cds/components/cds-command-executor/values.yaml
+++ b/kubernetes/cds/components/cds-command-executor/values.yaml
@@ -82,17 +82,17 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.2Gi"
+      memory: "200Mi"
     requests:
       cpu: "0.5"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "2"
-      memory: "0.4Gi"
+      memory: "400Mi"
     requests:
       cpu: "1"
-      memory: "0.4Gi"
+      memory: "400Mi"
   unlimited: {}
 
 #Pods Service Account
diff --git a/kubernetes/cds/components/cds-py-executor/values.yaml b/kubernetes/cds/components/cds-py-executor/values.yaml
index 427abf8ee0..f3d712e7c1 100755
--- a/kubernetes/cds/components/cds-py-executor/values.yaml
+++ b/kubernetes/cds/components/cds-py-executor/values.yaml
@@ -98,17 +98,17 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.2Gi"
+      memory: "200Mi"
     requests:
       cpu: "0.5"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "2"
-      memory: "0.4Gi"
+      memory: "400Mi"
     requests:
       cpu: "1"
-      memory: "0.4Gi"
+      memory: "400Mi"
   unlimited: {}
 
 #Pods Service Account
diff --git a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
index 8688d8b4c0..d9d63e353c 100644
--- a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
@@ -43,10 +43,10 @@ spec:
           resources:
             limits:
               cpu: "100m"
-              memory: "0.5Gi"
+              memory: "500Mi"
             requests:
               cpu: "3m"
-              memory: "0.02Gi"
+              memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/cds/components/cds-sdc-listener/values.yaml b/kubernetes/cds/components/cds-sdc-listener/values.yaml
index 19de4e2454..4658b578bf 100644
--- a/kubernetes/cds/components/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/values.yaml
@@ -98,10 +98,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.7Gi"
+      memory: "700Mi"
     requests:
       cpu: "0.5"
-      memory: "0.7Gi"
+      memory: "700Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/cds/components/cds-ui/values.yaml b/kubernetes/cds/components/cds-ui/values.yaml
index dfc20be7a2..7a25bea4c7 100644
--- a/kubernetes/cds/components/cds-ui/values.yaml
+++ b/kubernetes/cds/components/cds-ui/values.yaml
@@ -99,17 +99,17 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.2Gi"
+      memory: "200Mi"
     requests:
       cpu: "0.5"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "2"
-      memory: "0.2Gi"
+      memory: "200Mi"
     requests:
       cpu: "1"
-      memory: "0.2Gi"
+      memory: "200Mi"
   unlimited: {}
 
 #Pods Service Account
diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml
index 60b1484f68..8ad2240ee4 100644
--- a/kubernetes/cli/values.yaml
+++ b/kubernetes/cli/values.yaml
@@ -83,7 +83,7 @@ resources:
       memory: "2Gi"
     requests:
       cpu: "10m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "4"
diff --git a/kubernetes/common/cassandra/templates/backup/cronjob.yaml b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
index 8773cd3e4b..402d1688a7 100644
--- a/kubernetes/common/cassandra/templates/backup/cronjob.yaml
+++ b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
@@ -53,20 +53,20 @@ spec:
               resources:
                 limits:
                   cpu: "100m"
-                  memory: "0.5Gi"
+                  memory: "500Mi"
                 requests:
                   cpu: "3m"
-                  memory: "0.02Gi"
+                  memory: "20Mi"
             - name: "cassandra-backup-init"
               image: {{ include "repositoryGenerator.image.readiness" . }}
               imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
               resources:
                 limits:
                   cpu: "100m"
-                  memory: "0.5Gi"
+                  memory: "500Mi"
                 requests:
                   cpu: "3m"
-                  memory: "0.02Gi"
+                  memory: "20Mi"
               command:
               - /bin/bash
               - -c
diff --git a/kubernetes/common/common/templates/_log.tpl b/kubernetes/common/common/templates/_log.tpl
index ca296c5b35..993c48239a 100644
--- a/kubernetes/common/common/templates/_log.tpl
+++ b/kubernetes/common/common/templates/_log.tpl
@@ -30,10 +30,10 @@
   resources:
     requests:
       cpu: "10m"
-      memory: "0.005Gi"
+      memory: "5Mi"
     limits:
       cpu: "100m"
-      memory: "0.02Gi"
+      memory: "20Mi"
 {{- end -}}
 {{- end -}}
 
diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl
index 427e0cbad2..e21f0f658d 100644
--- a/kubernetes/common/common/templates/_mariadb.tpl
+++ b/kubernetes/common/common/templates/_mariadb.tpl
@@ -228,10 +228,10 @@ spec:
   resources:
     requests:
       cpu: "100m"
-      memory: "0.1Gi"
+      memory: "100Mi"
     limits:
       cpu: "300m"
-      memory: "0.5Gi"
+      memory: "500Mi"
 {{- end -}}
 
 {{/*
diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml
index 8182103225..5d3038bcb1 100644
--- a/kubernetes/common/dgbuilder/templates/deployment.yaml
+++ b/kubernetes/common/dgbuilder/templates/deployment.yaml
@@ -75,10 +75,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/common/elasticsearch/components/curator/values.yaml b/kubernetes/common/elasticsearch/components/curator/values.yaml
index 0a5080e917..00f113b5bb 100644
--- a/kubernetes/common/elasticsearch/components/curator/values.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/values.yaml
@@ -124,10 +124,10 @@ resources:
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits: {}
   #  cpu: "100m"
-  #  memory: "0.1Gi"
+  #  memory: "100Mi"
   requests: {}
   #  cpu: "100m"
-  #  memory: "0.1Gi"
+  #  memory: "100Mi"
 priorityClassName: ""
 # extraVolumes and extraVolumeMounts allows you to mount other volumes
 # Example Use Case: mount ssl certificates when elasticsearch has tls enabled
diff --git a/kubernetes/common/elasticsearch/components/data/values.yaml b/kubernetes/common/elasticsearch/components/data/values.yaml
index a0dad568d9..3f9992aaba 100644
--- a/kubernetes/common/elasticsearch/components/data/values.yaml
+++ b/kubernetes/common/elasticsearch/components/data/values.yaml
@@ -106,7 +106,7 @@ resources:
   ## resources, such as Minikube.
   limits: {}
   #   cpu: "100m"
-  #   memory: "0.1Gi"
+  #   memory: "100Mi"
   requests:
     cpu: "25m"
     memory: "1.1Gi"
diff --git a/kubernetes/common/elasticsearch/components/master/values.yaml b/kubernetes/common/elasticsearch/components/master/values.yaml
index f4ac74e2c3..a3a219ee31 100644
--- a/kubernetes/common/elasticsearch/components/master/values.yaml
+++ b/kubernetes/common/elasticsearch/components/master/values.yaml
@@ -111,10 +111,10 @@ resources:
     cpu: "250m"
     memory: "1.5Gi"
   #   cpu: "100m"
-  #   memory: "0.1Gi"
+  #   memory: "100Mi"
   requests:
     cpu: "5m"
-    memory: "0.3Gi"
+    memory: "300Mi"
 ## Elasticsearch master-eligible container's liveness and readiness probes
 ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
 ##
diff --git a/kubernetes/common/elasticsearch/values.yaml b/kubernetes/common/elasticsearch/values.yaml
index e1c8f72258..7851f2804f 100644
--- a/kubernetes/common/elasticsearch/values.yaml
+++ b/kubernetes/common/elasticsearch/values.yaml
@@ -95,10 +95,10 @@ resources:
   ## resources, such as Minikube.
   limits: {}
   #   cpu: "100m"
-  #   memory: "0.1Gi"
+  #   memory: "100Mi"
   requests:
     cpu: "25m"
-    memory: "0.2Gi"
+    memory: "200Mi"
 ## Elasticsearch coordinating-only container's liveness and readiness probes
 ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
 ##
diff --git a/kubernetes/common/etcd-init/templates/job.yaml b/kubernetes/common/etcd-init/templates/job.yaml
index 64c8b44071..f1f1b0e27e 100644
--- a/kubernetes/common/etcd-init/templates/job.yaml
+++ b/kubernetes/common/etcd-init/templates/job.yaml
@@ -50,10 +50,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
diff --git a/kubernetes/common/etcd-init/values.yaml b/kubernetes/common/etcd-init/values.yaml
index c9eac927eb..33e34fd086 100644
--- a/kubernetes/common/etcd-init/values.yaml
+++ b/kubernetes/common/etcd-init/values.yaml
@@ -60,17 +60,17 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "10m"
-      memory: "0.01Gi"
+      memory: "10Mi"
   large:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "20m"
-      memory: "0.02Gi"
+      memory: "20Mi"
   unlimited: {}
 
 #Pods Service Account
diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index 4a990768a0..29d643eb1e 100644
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -669,10 +669,10 @@ metrics:
     # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
     limits:
       cpu: "0.5"
-      memory: "0.2Gi"
+      memory: "200Mi"
     requests:
       cpu: "0.5"
-      memory: "0.2Gi"
+      memory: "200Mi"
   ## MariaDB Galera metrics container's liveness and readiness probes
   ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
   ##
diff --git a/kubernetes/common/mariadb-init/values.yaml b/kubernetes/common/mariadb-init/values.yaml
index e0ba28266a..5c181dded2 100644
--- a/kubernetes/common/mariadb-init/values.yaml
+++ b/kubernetes/common/mariadb-init/values.yaml
@@ -126,17 +126,17 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "10m"
-      memory: "0.01Gi"
+      memory: "10Mi"
   large:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "20m"
-      memory: "0.02Gi"
+      memory: "20Mi"
   unlimited: {}
 
 #Pods Service Account
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml
index 010ec0f66a..4d05ae37c7 100644
--- a/kubernetes/common/network-name-gen/templates/deployment.yaml
+++ b/kubernetes/common/network-name-gen/templates/deployment.yaml
@@ -46,10 +46,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}
         command:
diff --git a/kubernetes/common/postgres-init/values.yaml b/kubernetes/common/postgres-init/values.yaml
index 7e70019d73..d2eb090142 100644
--- a/kubernetes/common/postgres-init/values.yaml
+++ b/kubernetes/common/postgres-init/values.yaml
@@ -77,10 +77,10 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.3Gi"
+      memory: "300Mi"
     requests:
       cpu: "10m"
-      memory: "0.09Gi"
+      memory: "90Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/common/postgres/values.yaml b/kubernetes/common/postgres/values.yaml
index 5671f018ff..c0cdfef2d2 100644
--- a/kubernetes/common/postgres/values.yaml
+++ b/kubernetes/common/postgres/values.yaml
@@ -161,10 +161,10 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.3Gi"
+      memory: "300Mi"
     requests:
       cpu: "10m"
-      memory: "0.09Gi"
+      memory: "90Mi"
   large:
     limits:
       cpu: "2"
@@ -201,10 +201,10 @@ metrics:
     # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
     limits:
       cpu: "0.5"
-      memory: "0.2Gi"
+      memory: "200Mi"
     requests:
       cpu: "0.5"
-      memory: "0.2Gi"
+      memory: "200Mi"
   ## Postgres metrics container's liveness and readiness probes
   ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
   ##
diff --git a/kubernetes/common/readinessCheck/values.yaml b/kubernetes/common/readinessCheck/values.yaml
index 2fdb613c29..239743e106 100644
--- a/kubernetes/common/readinessCheck/values.yaml
+++ b/kubernetes/common/readinessCheck/values.yaml
@@ -20,7 +20,7 @@ group: 65533
 
 limits:
   cpu: "100m"
-  memory: "0.5Gi"
+  memory: "500Mi"
 requests:
   cpu: "3m"
-  memory: "0.02Gi"
+  memory: "20Mi"
diff --git a/kubernetes/common/timescaledb/values.yaml b/kubernetes/common/timescaledb/values.yaml
index b4070bb810..2643f55062 100644
--- a/kubernetes/common/timescaledb/values.yaml
+++ b/kubernetes/common/timescaledb/values.yaml
@@ -64,10 +64,10 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.3Gi"
+      memory: "300Mi"
     requests:
       cpu: "10m"
-      memory: "0.09Gi"
+      memory: "90Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
index 695cfd2ef6..47599c62dd 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
@@ -82,10 +82,10 @@ resources:
   small:
     limits:
       cpu: "2"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "4"
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
index 252a9ab941..6817d49b98 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
@@ -117,10 +117,10 @@ resources:
   small:
     limits:
       cpu: "2"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "4"
diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
index 1ca814e11e..8b8f928c39 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
@@ -61,10 +61,10 @@ resources:
   small:
     limits:
       cpu: "2"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "4"
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
index 649b87eb85..4deaed3fe6 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
@@ -54,10 +54,10 @@ resources:
   small:
     limits:
       cpu: "2"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "4"
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
index 52f9475ef3..c2b810fa0a 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
@@ -60,10 +60,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       {{ if .Values.config.msb_enabled }}
       {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for.msb ) | indent 6 | trim }}
       {{ end }}
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
index fc3067718a..ed432f81b5 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
@@ -181,17 +181,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 #Pods Service Account
diff --git a/kubernetes/msb/components/kube2msb/templates/deployment.yaml b/kubernetes/msb/components/kube2msb/templates/deployment.yaml
index 37677149fa..5fc09754e0 100644
--- a/kubernetes/msb/components/kube2msb/templates/deployment.yaml
+++ b/kubernetes/msb/components/kube2msb/templates/deployment.yaml
@@ -55,10 +55,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/msb/components/kube2msb/values.yaml b/kubernetes/msb/components/kube2msb/values.yaml
index b8571346c5..bdc7c06b3b 100644
--- a/kubernetes/msb/components/kube2msb/values.yaml
+++ b/kubernetes/msb/components/kube2msb/values.yaml
@@ -56,10 +56,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/msb/components/msb-consul/values.yaml b/kubernetes/msb/components/msb-consul/values.yaml
index c29bb988da..37ccf988d8 100644
--- a/kubernetes/msb/components/msb-consul/values.yaml
+++ b/kubernetes/msb/components/msb-consul/values.yaml
@@ -70,10 +70,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/msb/components/msb-discovery/templates/deployment.yaml b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
index b09d2fd715..81458aa4e8 100644
--- a/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
@@ -54,10 +54,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/msb/components/msb-discovery/values.yaml b/kubernetes/msb/components/msb-discovery/values.yaml
index cb97f5e0c3..b8c361a296 100644
--- a/kubernetes/msb/components/msb-discovery/values.yaml
+++ b/kubernetes/msb/components/msb-discovery/values.yaml
@@ -70,10 +70,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/msb/components/msb-eag/templates/deployment.yaml b/kubernetes/msb/components/msb-eag/templates/deployment.yaml
index abc6228f0a..42fa3950c4 100644
--- a/kubernetes/msb/components/msb-eag/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-eag/templates/deployment.yaml
@@ -41,10 +41,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/msb/components/msb-eag/values.yaml b/kubernetes/msb/components/msb-eag/values.yaml
index 23769a1fd7..49f0be78f5 100644
--- a/kubernetes/msb/components/msb-eag/values.yaml
+++ b/kubernetes/msb/components/msb-eag/values.yaml
@@ -77,10 +77,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/msb/components/msb-iag/templates/deployment.yaml b/kubernetes/msb/components/msb-iag/templates/deployment.yaml
index abc6228f0a..42fa3950c4 100644
--- a/kubernetes/msb/components/msb-iag/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-iag/templates/deployment.yaml
@@ -41,10 +41,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/msb/components/msb-iag/values.yaml b/kubernetes/msb/components/msb-iag/values.yaml
index 0497fc4161..19b500a62c 100644
--- a/kubernetes/msb/components/msb-iag/values.yaml
+++ b/kubernetes/msb/components/msb-iag/values.yaml
@@ -77,10 +77,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index 38111cd6a6..932399e735 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -119,17 +119,17 @@ mongodb:
     small:
       limits:
         cpu: "100m"
-        memory: "0.3Gi"
+        memory: "300Mi"
       requests:
         cpu: "10m"
-        memory: "0.07Gi"
+        memory: "70Mi"
     large:
       limits:
         cpu: "200m"
         memory: "1Gi"
       requests:
         cpu: "50m"
-        memory: "0.3Gi"
+        memory: "300Mi"
     unlimited: {}
 
 #etcd chart overrides for k8splugin
@@ -163,17 +163,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "10m"
-      memory: "0.01Gi"
+      memory: "10Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "10m"
-      memory: "0.1Gi"
+      memory: "100Mi"
   unlimited: {}
 
 #Pods Service Account
diff --git a/kubernetes/onap/resources/environments/core-onap.yaml b/kubernetes/onap/resources/environments/core-onap.yaml
index ea9b15e926..ebfe688619 100644
--- a/kubernetes/onap/resources/environments/core-onap.yaml
+++ b/kubernetes/onap/resources/environments/core-onap.yaml
@@ -100,7 +100,7 @@ sdc:
           memory: "2Gi"
         requests:
           cpu: "10m"
-          memory: "0.5Gi"
+          memory: "500Mi"
   sdc-cs:
     config:
       maxHeapSize: "512M"
diff --git a/kubernetes/onap/resources/environments/minimal-onap.yaml b/kubernetes/onap/resources/environments/minimal-onap.yaml
index 11bc653cd4..5a628c8c7d 100644
--- a/kubernetes/onap/resources/environments/minimal-onap.yaml
+++ b/kubernetes/onap/resources/environments/minimal-onap.yaml
@@ -89,7 +89,7 @@ robot:
         memory: "2Gi"
       requests:
         cpu: "10m"
-        memory: "0.1Gi"
+        memory: "100Mi"
 sdc:
   enabled: true
   sdc-be:
@@ -103,7 +103,7 @@ sdc:
           memory: "2Gi"
         requests:
           cpu: "10m"
-          memory: "0.5Gi"
+          memory: "500Mi"
   sdc-cs:
     config:
       maxHeapSize: "512M"
diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index 9cd417dad4..dc5da35113 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -108,7 +108,7 @@ sdc:
           memory: "2Gi"
         requests:
           cpu: "10m"
-          memory: "0.5Gi"
+          memory: "500Mi"
   sdc-cs:
     config:
       maxHeapSize: "512M"
diff --git a/kubernetes/oof/components/oof-has/values.yaml b/kubernetes/oof/components/oof-has/values.yaml
index d528677087..33558c4567 100755
--- a/kubernetes/oof/components/oof-has/values.yaml
+++ b/kubernetes/oof/components/oof-has/values.yaml
@@ -114,17 +114,17 @@ etcd:
     small:
       limits:
         cpu: "100m"
-        memory: "0.3Gi"
+        memory: "300Mi"
       requests:
         cpu: "10m"
-        memory: "0.07Gi"
+        memory: "70Mi"
     large:
       limits:
         cpu: "200m"
         memory: "1Gi"
       requests:
         cpu: "50m"
-        memory: "0.3Gi"
+        memory: "300Mi"
     unlimited: {}
 
 etcd-init:
diff --git a/kubernetes/platform/components/chartmuseum/values.yaml b/kubernetes/platform/components/chartmuseum/values.yaml
index 3367083a24..7068990c7d 100644
--- a/kubernetes/platform/components/chartmuseum/values.yaml
+++ b/kubernetes/platform/components/chartmuseum/values.yaml
@@ -83,10 +83,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
index 7645ccde79..b038b5264b 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
@@ -36,10 +36,10 @@ deployment:
   resources:
     limits:
       cpu: "250m"
-      memory: "0.1Gi"
+      memory: "100Mi"
     requests:
       cpu: "100m"
-      memory: "0.06Gi"
+      memory: "60Mi"
 readinessCheck:
   wait_for:
     - oom-cert-service
diff --git a/kubernetes/platform/components/oauth2-proxy/components/oauth2-proxy/values.yaml b/kubernetes/platform/components/oauth2-proxy/components/oauth2-proxy/values.yaml
index 6b56132eea..8f81e15d03 100644
--- a/kubernetes/platform/components/oauth2-proxy/components/oauth2-proxy/values.yaml
+++ b/kubernetes/platform/components/oauth2-proxy/components/oauth2-proxy/values.yaml
@@ -165,10 +165,10 @@ ingress:
 resources: {}
   # limits:
   #   cpu: "100m"
-  #   memory: "0.3Gi"
+  #   memory: "300Mi"
   # requests:
   #   cpu: "100m"
-  #   memory: "0.3Gi"
+  #   memory: "300Mi"
 
 extraVolumes: []
   # - name: ca-bundle-cert
diff --git a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
index 0ae9766b3b..657606b2ef 100644
--- a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
+++ b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
@@ -70,10 +70,10 @@ spec:
           resources:
             limits:
               cpu: "100m"
-              memory: "0.5Gi"
+              memory: "500Mi"
             requests:
               cpu: "3m"
-              memory: "0.02Gi"
+              memory: "20Mi"
         - name: subsitute-envs
           image: {{ include "repositoryGenerator.image.envsubst" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
diff --git a/kubernetes/platform/components/oom-cert-service/values.yaml b/kubernetes/platform/components/oom-cert-service/values.yaml
index 37ad335c4a..52e7649d6f 100644
--- a/kubernetes/platform/components/oom-cert-service/values.yaml
+++ b/kubernetes/platform/components/oom-cert-service/values.yaml
@@ -62,10 +62,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/policy/components/policy-api/templates/deployment.yaml b/kubernetes/policy/components/policy-api/templates/deployment.yaml
index e7e8e52f69..0456c866a8 100755
--- a/kubernetes/policy/components/policy-api/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-api/templates/deployment.yaml
@@ -29,10 +29,10 @@ spec:
           resources:
             limits:
               cpu: "100m"
-              memory: "0.5Gi"
+              memory: "500Mi"
             requests:
               cpu: "3m"
-              memory: "0.02Gi"
+              memory: "20Mi"
         - command:
           - sh
           args:
diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
index 12dc5020a9..a432fff142 100755
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
@@ -95,10 +95,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.7Gi"
+      memory: "700Mi"
     requests:
       cpu: "0.5"
-      memory: "0.7Gi"
+      memory: "700Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
index 7b6b98545a..67a70227c0 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
@@ -48,10 +48,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       - command:
         - sh
         args:
diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
index 0fc6443559..fd2fe2e5df 100755
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -128,10 +128,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
index c483b5fd3d..ed09551e6a 100755
--- a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
@@ -43,10 +43,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
 {{- if not .Values.nexus.offline }}
       - command:
         - /app/ready.py
@@ -65,10 +65,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
 {{- end }}
       containers:
         - name: {{ include "common.name" . }}
diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index dfd5e8f73e..6e86b3e64a 100755
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -158,10 +158,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.8Gi"
+      memory: "800Mi"
     requests:
       cpu: "0.5"
-      memory: "0.8Gi"
+      memory: "800Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/policy/components/policy-gui/templates/deployment.yaml b/kubernetes/policy/components/policy-gui/templates/deployment.yaml
index f175777d91..ba90086315 100644
--- a/kubernetes/policy/components/policy-gui/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-gui/templates/deployment.yaml
@@ -61,10 +61,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         # side car containers
         {{ if .Values.global.centralizedLoggingEnabled }}{{ include "common.log.sidecar" . | nindent 8 }}{{ end }}
diff --git a/kubernetes/policy/components/policy-gui/values.yaml b/kubernetes/policy/components/policy-gui/values.yaml
index 3aaf001bc8..3338d8f724 100644
--- a/kubernetes/policy/components/policy-gui/values.yaml
+++ b/kubernetes/policy/components/policy-gui/values.yaml
@@ -110,10 +110,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.7Gi"
+      memory: "700Mi"
     requests:
       cpu: "0.5"
-      memory: "0.7Gi"
+      memory: "700Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/policy/components/policy-nexus/values.yaml b/kubernetes/policy/components/policy-nexus/values.yaml
index f9cb1084be..f10d55dcee 100755
--- a/kubernetes/policy/components/policy-nexus/values.yaml
+++ b/kubernetes/policy/components/policy-nexus/values.yaml
@@ -87,7 +87,7 @@ resources:
       memory: "1Gi"
     requests:
       cpu: "1m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/policy/components/policy-pap/templates/deployment.yaml b/kubernetes/policy/components/policy-pap/templates/deployment.yaml
index 5ff3062538..7346b99c55 100755
--- a/kubernetes/policy/components/policy-pap/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-pap/templates/deployment.yaml
@@ -52,10 +52,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       - command:
         - sh
         args:
diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
index f3cccff32b..e89dd7c8fe 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
@@ -45,10 +45,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       - command:
         - sh
         args:
diff --git a/kubernetes/policy/templates/job.yaml b/kubernetes/policy/templates/job.yaml
index 2a61429544..7129392e39 100755
--- a/kubernetes/policy/templates/job.yaml
+++ b/kubernetes/policy/templates/job.yaml
@@ -218,10 +218,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-galera-db-migrator
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbmigrator.image }}
@@ -317,10 +317,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-pg-db-migrator
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbmigrator.image }}
diff --git a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
index 7c1d4a4208..92bad926f8 100644
--- a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
@@ -46,10 +46,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       - name: {{ include "common.name" . }}-job-completion
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: "{{ .Values.global.pullPolicy | default .Values.pullPolicy }}"
@@ -67,10 +67,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/sdc/components/sdc-be/templates/job.yaml b/kubernetes/sdc/components/sdc-be/templates/job.yaml
index bdb6821a0a..4a0f830b9a 100644
--- a/kubernetes/sdc/components/sdc-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/job.yaml
@@ -49,10 +49,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.backendInitImage }}
@@ -75,7 +75,7 @@ spec:
             memory: "1Gi"
           requests:
             cpu: "200m"
-            memory: "0.2Gi"
+            memory: "200Mi"
       {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
diff --git a/kubernetes/sdc/components/sdc-cs/templates/job.yaml b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
index 6e9169d94d..8650fff378 100644
--- a/kubernetes/sdc/components/sdc-cs/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
@@ -51,10 +51,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.cassandraInitImage }}
@@ -90,7 +90,7 @@ spec:
             memory: "1Gi"
           requests:
             cpu: "200m"
-            memory: "0.3Gi"
+            memory: "300Mi"
       {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
diff --git a/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml
index f40ada0308..befb609870 100644
--- a/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml
@@ -45,10 +45,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/sdc/components/sdc-helm-validator/values.yaml b/kubernetes/sdc/components/sdc-helm-validator/values.yaml
index 84a6abea01..3470770ac6 100644
--- a/kubernetes/sdc/components/sdc-helm-validator/values.yaml
+++ b/kubernetes/sdc/components/sdc-helm-validator/values.yaml
@@ -59,10 +59,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
index 4bab6315b2..0bba380efd 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
@@ -43,10 +43,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
index 4cef90b920..3770e69cd8 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
@@ -47,10 +47,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.onboardingInitImage }}
@@ -91,7 +91,7 @@ spec:
             memory: "1Gi"
           requests:
             cpu: "200m"
-            memory: "0.2Gi"
+            memory: "200Mi"
       {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
index 910cf1bfd7..ec87f1dd0d 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
@@ -44,10 +44,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       {{ end }}
       containers:
         - name: {{ include "common.name" . }}
diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
index de90704e43..a305911d1f 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
@@ -48,10 +48,10 @@ spec:
           resources:
             limits:
               cpu: "100m"
-              memory: "0.5Gi"
+              memory: "500Mi"
             requests:
               cpu: "3m"
-              memory: "0.02Gi"
+              memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-job
         image:
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml b/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
index e750143827..4925689477 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
@@ -41,10 +41,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
index 25f4033693..0a31e82590 100644
--- a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
@@ -68,10 +68,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - command:
         - /opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
index b5c2a8efe3..146f06fdbd 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
@@ -64,10 +64,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           command: ["/bin/bash"]
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
index 5a6b755fe9..a1c90071b0 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
@@ -127,10 +127,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
index 7443f69142..34b0164b97 100644
--- a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
@@ -43,10 +43,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/sdnc/components/sdnc-prom/values.yaml b/kubernetes/sdnc/components/sdnc-prom/values.yaml
index e2f3b34ec4..e52bc24a2d 100644
--- a/kubernetes/sdnc/components/sdnc-prom/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/values.yaml
@@ -97,10 +97,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
index 4e16fcf695..3825b9945f 100644
--- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
@@ -41,10 +41,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
 
       containers:
         - name: {{ include "common.name" . }}
diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml
index 265068b6e2..98e44d02ab 100644
--- a/kubernetes/sdnc/components/sdnc-web/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/values.yaml
@@ -94,10 +94,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
index 8c19a21583..d37403262c 100644
--- a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
@@ -73,10 +73,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - command:
         - /opt/onap/sdnc/ueb-listener/bin/start-ueb-listener.sh
diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
index 7e73f9d1a2..983fe57fbc 100755
--- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
+++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
@@ -49,10 +49,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-sdnrdb-init-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index ac34d2c4f0..f8e03b1618 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -159,10 +159,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
         {{ end }}
       - name: {{ include "common.name" . }}-chown
         image: {{ include "repositoryGenerator.image.busybox" . }}
diff --git a/kubernetes/strimzi/values.yaml b/kubernetes/strimzi/values.yaml
index 541b4f80cd..3b420821ff 100644
--- a/kubernetes/strimzi/values.yaml
+++ b/kubernetes/strimzi/values.yaml
@@ -106,7 +106,7 @@ metrics:
     resources:
       requests:
         cpu: "2"
-        memory: "0.6Gi"
+        memory: "600Mi"
       limits:
         cpu: "5"
         memory: "1.5Gi"
diff --git a/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml b/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
index 091af3f382..9191af01d0 100644
--- a/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
+++ b/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
@@ -51,10 +51,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.image.postgres" . }}
diff --git a/kubernetes/uui/components/uui-intent-analysis/values.yaml b/kubernetes/uui/components/uui-intent-analysis/values.yaml
index 71ec4e1d1e..47a30f8623 100644
--- a/kubernetes/uui/components/uui-intent-analysis/values.yaml
+++ b/kubernetes/uui/components/uui-intent-analysis/values.yaml
@@ -114,7 +114,7 @@ resources:
       memory: "1Gi"
     requests:
       cpu: "1"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "4"
diff --git a/kubernetes/uui/components/uui-nlp/values.yaml b/kubernetes/uui/components/uui-nlp/values.yaml
index cc87923e1e..cdfa50e3c0 100644
--- a/kubernetes/uui/components/uui-nlp/values.yaml
+++ b/kubernetes/uui/components/uui-nlp/values.yaml
@@ -85,7 +85,7 @@ resources:
       memory: "1Gi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/uui/components/uui-server/templates/deployment.yaml b/kubernetes/uui/components/uui-server/templates/deployment.yaml
index aec28579d6..64a041349e 100644
--- a/kubernetes/uui/components/uui-server/templates/deployment.yaml
+++ b/kubernetes/uui/components/uui-server/templates/deployment.yaml
@@ -65,10 +65,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/uui/components/uui-server/templates/job.yaml b/kubernetes/uui/components/uui-server/templates/job.yaml
index d1874fcef7..943079b99f 100644
--- a/kubernetes/uui/components/uui-server/templates/job.yaml
+++ b/kubernetes/uui/components/uui-server/templates/job.yaml
@@ -43,10 +43,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.image.postgres" . }}
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
index f3aaa25846..c96712be4f 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
@@ -73,17 +73,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 # Log configuration
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
index 9d4497dadf..280c0388c9 100644
--- a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
@@ -55,10 +55,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           command:
diff --git a/kubernetes/vfc/components/vfc-nslcm/values.yaml b/kubernetes/vfc/components/vfc-nslcm/values.yaml
index 649c35c63a..48cce40822 100644
--- a/kubernetes/vfc/components/vfc-nslcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/values.yaml
@@ -94,17 +94,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 # Log configuration
diff --git a/kubernetes/vfc/components/vfc-redis/values.yaml b/kubernetes/vfc/components/vfc-redis/values.yaml
index c772e7ac2c..60c95b9b7c 100644
--- a/kubernetes/vfc/components/vfc-redis/values.yaml
+++ b/kubernetes/vfc/components/vfc-redis/values.yaml
@@ -67,15 +67,15 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
\ No newline at end of file
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
index f131cf3d38..a9cf562e5b 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
@@ -55,10 +55,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           command:
diff --git a/kubernetes/vfc/components/vfc-vnflcm/values.yaml b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
index 9670d07673..bc22a32206 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
@@ -94,17 +94,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 # Log configuration
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
index d5bbecd183..7644ba34d5 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
@@ -55,10 +55,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           command:
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
index 35ebad5ae0..31b5a66fd0 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
@@ -93,17 +93,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 # Log configuration
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
index a5ad3f495b..ae9656ac4f 100644
--- a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
@@ -55,10 +55,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           command:
diff --git a/kubernetes/vfc/components/vfc-vnfres/values.yaml b/kubernetes/vfc/components/vfc-vnfres/values.yaml
index 58cfa161af..2c54249de4 100644
--- a/kubernetes/vfc/components/vfc-vnfres/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml
@@ -94,17 +94,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 # Log configuration
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
index abe7c6100e..3588ba548e 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
@@ -73,17 +73,17 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "50m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "200m"
       memory: "1Gi"
     requests:
       cpu: "100m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 # Log configuration
diff --git a/kubernetes/vnfsdk/templates/job.yaml b/kubernetes/vnfsdk/templates/job.yaml
index 44c08428a3..ea06b54679 100644
--- a/kubernetes/vnfsdk/templates/job.yaml
+++ b/kubernetes/vnfsdk/templates/job.yaml
@@ -52,10 +52,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.image.postgres" . }}