diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index 234718c..1f666dd 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -102,10 +102,10 @@
         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 a36d904..7d73876 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 @@
         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 7d2504e..ac40f09 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 @@
         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 6310f9e..6b7f89f 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 @@
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       - command:
         - sh
         args:
@@ -238,10 +238,10 @@
         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 edf63c5..1e2880d 100644
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -126,10 +126,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/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
index d955837..1685bc5 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 @@
         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 3171d4c..d6e49ac 100644
--- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
@@ -145,10 +145,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/aai/components/aai-traversal/templates/job.yaml b/kubernetes/aai/components/aai-traversal/templates/job.yaml
index 2d7daf1..ae8bd85 100644
--- a/kubernetes/aai/components/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/job.yaml
@@ -61,10 +61,10 @@
         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 }}