diff --git a/kubernetes/msb/components/kube2msb/templates/deployment.yaml b/kubernetes/msb/components/kube2msb/templates/deployment.yaml
index 3767714..5fc0975 100644
--- a/kubernetes/msb/components/kube2msb/templates/deployment.yaml
+++ b/kubernetes/msb/components/kube2msb/templates/deployment.yaml
@@ -55,10 +55,10 @@
         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 b857134..bdc7c06 100644
--- a/kubernetes/msb/components/kube2msb/values.yaml
+++ b/kubernetes/msb/components/kube2msb/values.yaml
@@ -56,10 +56,10 @@
   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 c29bb98..37ccf98 100644
--- a/kubernetes/msb/components/msb-consul/values.yaml
+++ b/kubernetes/msb/components/msb-consul/values.yaml
@@ -70,10 +70,10 @@
   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 b09d2fd..81458aa 100644
--- a/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
@@ -54,10 +54,10 @@
         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 cb97f5e..b8c361a 100644
--- a/kubernetes/msb/components/msb-discovery/values.yaml
+++ b/kubernetes/msb/components/msb-discovery/values.yaml
@@ -70,10 +70,10 @@
   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 abc6228..42fa395 100644
--- a/kubernetes/msb/components/msb-eag/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-eag/templates/deployment.yaml
@@ -41,10 +41,10 @@
         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 23769a1..49f0be7 100644
--- a/kubernetes/msb/components/msb-eag/values.yaml
+++ b/kubernetes/msb/components/msb-eag/values.yaml
@@ -77,10 +77,10 @@
   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 abc6228..42fa395 100644
--- a/kubernetes/msb/components/msb-iag/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-iag/templates/deployment.yaml
@@ -41,10 +41,10 @@
         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 0497fc4..19b500a 100644
--- a/kubernetes/msb/components/msb-iag/values.yaml
+++ b/kubernetes/msb/components/msb-iag/values.yaml
@@ -77,10 +77,10 @@
   small:
     limits:
       cpu: "1"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "0.5"
-      memory: "0.5Gi"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"