diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index 32074d9..2b05dbe 100644
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -114,14 +114,14 @@
       cpu: 0.25
     limits:
       memory: 4Gi
-      cpu: 999
+      cpu: 0.5
   large:
     requests:
       memory: 2Gi
       cpu: 0.5
     limits:
       memory: 8Gi
-      cpu: 999
+      cpu: 1
   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 0d5a0c4..80d5b67 100755
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -136,14 +136,14 @@
   small:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 3Gi
       cpu: 0.5
   large:
     limits:
       memory: 6Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 6Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index 23a3b69..619ef03 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -100,14 +100,14 @@
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 09e631a..3855c19 100755
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -122,14 +122,14 @@
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
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 32171ba..2084bef 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -113,17 +113,17 @@
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 5Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
-      cpu: 4
+      cpu: 1
   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 0c02cb2..ca4e787 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
@@ -87,14 +87,14 @@
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
index e2816b0..f565eb0 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
@@ -96,14 +96,14 @@
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml
index c6a6f35..8e83734 100755
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -121,14 +121,14 @@
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml
index 24a171c..3ce43c6 100755
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -103,14 +103,14 @@
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 3258f8f..3b68a36 100755
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -105,14 +105,14 @@
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index 0ec56c0..5f02a85 100755
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -96,14 +96,14 @@
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index eea19df..77b94dd 100755
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -107,14 +107,14 @@
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index 1f0a18d..9542ab8 100755
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -116,14 +116,14 @@
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
index e1d211c..183e7f6 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
@@ -53,14 +53,14 @@
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index bf412e8..81cd1d9 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -549,14 +549,14 @@
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 4Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 8Gi
     requests:
       cpu: 1