diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index 2da7dd0..c10b509 100644
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -121,18 +121,18 @@
 resources:
   small:
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
     limits:
-      memory: 4Gi
-      cpu: 1
+      cpu: "1"
+      memory: "4Gi"
   large:
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
     limits:
-      memory: 8Gi
-      cpu: 2
+      cpu: "2"
+      memory: "8Gi"
   unlimited: {}
 readinessProbe:
   port: 9091
diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index f47d142..f871e0f 100755
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -146,18 +146,18 @@
 resources:
   small:
     limits:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "3Gi"
   large:
     limits:
-      memory: 6Gi
-      cpu: 2
+      cpu: "2"
+      memory: "6Gi"
     requests:
-      memory: 6Gi
-      cpu: 1
+      cpu: "1"
+      memory: "6Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health
diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index da4f9c6..5a5325f 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -108,18 +108,18 @@
 resources:
   small:
     limits:
-      memory: 1.5Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      memory: 1.5Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      memory: 3Gi
-      cpu: 2
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health
diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index f11a961..32f8727 100755
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -130,18 +130,18 @@
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 2Gi
-      cpu: 2
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health
diff --git a/kubernetes/so/components/so-cnfm-lcm/values.yaml b/kubernetes/so/components/so-cnfm-lcm/values.yaml
index 0a85a10..9a85ec8 100644
--- a/kubernetes/so/components/so-cnfm-lcm/values.yaml
+++ b/kubernetes/so/components/so-cnfm-lcm/values.yaml
@@ -103,18 +103,18 @@
 resources:
   small:
     limits:
-      memory: 4Gi
-      cpu: 2000m
+      cpu: "2000m"
+      memory: "4Gi"
     requests:
-      memory: 1Gi
-      cpu: 500m
+      cpu: "500m"
+      memory: "1Gi"
   large:
     limits:
-      memory: 8Gi
-      cpu: 4000m
+      cpu: "4000m"
+      memory: "8Gi"
     requests:
-      memory: 2Gi
-      cpu: 1000m
+      cpu: "1000m"
+      memory: "2Gi"
   unlimited: {}
 
 livenessProbe:
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index 48e923c..dc6f2b7 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -127,18 +127,18 @@
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 5Gi
-      cpu: 2
+      cpu: "2"
+      memory: "5Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 livenessProbe:
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
index ca4e787..bea0a28 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
@@ -86,18 +86,18 @@
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 2Gi
-      cpu: 2
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 livenessProbe:
   port: 9092
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
index 0d06ed7..2b219d0 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
@@ -104,18 +104,18 @@
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 2Gi
-      cpu: 2
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health
diff --git a/kubernetes/so/components/so-mariadb/templates/job.yaml b/kubernetes/so/components/so-mariadb/templates/job.yaml
index 0afe02a..abbe599 100644
--- a/kubernetes/so/components/so-mariadb/templates/job.yaml
+++ b/kubernetes/so/components/so-mariadb/templates/job.yaml
@@ -116,6 +116,13 @@
               fieldPath: metadata.namespace
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}-config
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/so/components/so-mariadb/values.yaml b/kubernetes/so/components/so-mariadb/values.yaml
index 8b29e62..38b4d3f 100755
--- a/kubernetes/so/components/so-mariadb/values.yaml
+++ b/kubernetes/so/components/so-mariadb/values.yaml
@@ -163,18 +163,18 @@
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}
 
 persistence:
diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml
index 77fe172..d45ee69 100755
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -131,18 +131,18 @@
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 2Gi
-      cpu: 2
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health
diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml
index 967d13e..d1b795d 100755
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -113,18 +113,18 @@
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 2Gi
-      cpu: 2
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health
diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 9159fda..15074b5 100755
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -115,18 +115,18 @@
 resources:
   small:
     limits:
-      memory: 1.5Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      memory: 1.5Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      memory: 3Gi
-      cpu: 2
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health
diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index 7e2d521..9eecb24 100755
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -106,18 +106,18 @@
 resources:
   small:
     limits:
-      memory: 1.5Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      memory: 1.5Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      memory: 3Gi
-      cpu: 2
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health
diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index cab0d44..1fe5b50 100755
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -117,18 +117,18 @@
 resources:
   small:
     limits:
-      memory: 1.5Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      memory: 1.5Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      memory: 3Gi
-      cpu: 2
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 
 livenessProbe:
diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index 8e6c044..61ec096 100755
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -126,18 +126,18 @@
 resources:
   small:
     limits:
-      memory: 1.5Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      memory: 1.5Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      memory: 3Gi
-      cpu: 2
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
index 183e7f6..96ff778 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
@@ -52,18 +52,18 @@
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 2Gi
-      cpu: 2
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 livenessProbe:
   port: 9098