diff --git a/charts/product-factory/Chart.yaml b/charts/product-factory/Chart.yaml
index 2b3af97f..5cd108df 100644
--- a/charts/product-factory/Chart.yaml
+++ b/charts/product-factory/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: product-factory
 description: Helm chart for product factory application
 type: application
-version: 4.36.0
-appVersion: 4.36.0
+version: 4.37.0
+appVersion: 4.37.0
diff --git a/charts/product-factory/templates/deployment.yaml b/charts/product-factory/templates/deployment.yaml
index 7cc8a8c8..6cb71560 100644
--- a/charts/product-factory/templates/deployment.yaml
+++ b/charts/product-factory/templates/deployment.yaml
@@ -209,22 +209,24 @@ spec:
               value: {{ .Values.productFactory.cobaffschemalimit.enabled | quote }}
             - name: PRODUCT_FACTORY_FINANCIAL_LIMIT_TYPE_ENABLED
               value: {{ .Values.productFactory.financiallimittype.enabled | quote }}
+            - name: PRODUCT_FACTORY_CRDINTACC_TYPE_ENABLED
+              value: {{ .Values.productFactory.crdintacctype.enabled | quote }}
             - name: PRODUCT_FACTORY_COUNTRY_CCMS_ENABLED
               value: {{ .Values.productFactory.country.ccms.enabled | quote }}
             - name: PRODUCT_FACTORY_CURRENCY_CCMS_ENABLED
               value: {{ .Values.productFactory.currency.ccms.enabled | quote }}
             - name: PRODUCT_FACTORY_COUNTRY_SIRSPE_ENABLED
               value: {{ .Values.productFactory.country.sirspe.enabled | quote }}
-            - name: PRODUCT_FACTORY_COUNTRY_ENABLED
-              value: {{ .Values.productFactory.country.enabled | quote }}
             - name: PRODUCT_FACTORY_CURRENCY_SIRSPE_ENABLED
               value: {{ .Values.productFactory.currency.sirspe.enabled | quote }}
-            - name: PRODUCT_FACTORY_CRDINTACC_TYPE_ENABLED
-              value: {{ .Values.productFactory.crdintacctype.enabled | quote }}
+            - name: PRODUCT_FACTORY_COUNTRY_UNIVERSAL_ENABLED
+              value: {{ .Values.productFactory.country.universal.enabled | quote }}
+            - name: PRODUCT_FACTORY_CURRENCY_UNIVERSAL_ENABLED
+              value: {{ .Values.productFactory.currency.universal.enabled | quote }}
             - name: PRODUCT_FACTORY_CALENDAR_ENABLED
               value: {{ .Values.productFactory.calendar.enabled | quote }}
-            - name: PRODUCT_FACTORY_CALENDAR_ITEM_ENABLED
-              value: {{ .Values.productFactory.calendarItem.enabled | quote }}
+            - name: PRODUCT_FACTORY_CALENDARITEM_ENABLED
+              value: {{ .Values.productFactory.calendaritem.enabled | quote }}
             - name: PRODUCT_FACTORY_CLEARINGSYSREG_ENABLED
               value: {{ .Values.productFactory.clearingsysreg.enabled | quote }}
             - name: PRODUCT_FACTORY_BANKPRODUCTTYPE_ENABLED
@@ -233,6 +235,18 @@ spec:
               value: {{ .Values.productFactory.purposesubtype.enabled | quote }}
             - name: PRODUCT_FACTORY_BPTSTATUSSCH_ENABLED
               value: {{ .Values.productFactory.bptStatusSch.enabled | quote }}
+            - name: PRODUCT_FACTORY_CALENDAR_UNIVERSAL_ENABLED
+              value: {{ .Values.productFactory.calendar.universal.enabled | quote }}
+            - name: PRODUCT_FACTORY_CALENDARITEM_UNIVERSAL_ENABLED
+              value: {{ .Values.productFactory.calendaritem.universal.enabled | quote }}
+            - name: PRODUCT_FACTORY_CLEARINGSYSREG_UNIVERSAL_ENABLED
+              value: {{ .Values.productFactory.clearingsysreg.universal.enabled | quote }}
+            - name: PRODUCT_FACTORY_BANKPRODUCTTYPE_UNIVERSAL_ENABLED
+              value: {{ .Values.productFactory.bankproducttype.universal.enabled | quote }}
+            - name: PRODUCT_FACTORY_PURPOSESUBTYPE_UNIVERSAL_ENABLED
+              value: {{ .Values.productFactory.purposesubtype.universal.enabled | quote }}
+            - name: PRODUCT_FACTORY_BPTSTATUSSCH_UNIVERSAL_ENABLED
+              value: {{ .Values.productFactory.bptStatusSch.universal.enabled | quote }}
             - name: PRODUCT_FACTORY_BICEXCLUSION_ENABLED
               value: {{ .Values.productFactory.bicexclusion.enabled | quote }}
             - name: SERVER_SSL_KEYSTORE
diff --git a/charts/product-factory/values.yaml b/charts/product-factory/values.yaml
index 2c9cd905..bfabc62c 100644
--- a/charts/product-factory/values.yaml
+++ b/charts/product-factory/values.yaml
@@ -115,31 +115,48 @@ productFactory:
     enabled: false
   financiallimittype:
     enabled: false
-  country:
+  crdintacctype:
     enabled: false
+    universal:
+      enabled: false
+  country:
+    universal:
+      enabled: false
     sirspe:
       enabled: false
     ccms:
       enabled: false
   currency:
+    universal:
+      enabled: false
     sirspe:
       enabled: false
     ccms:
       enabled: false
   bankproducttype:
     enabled: false
+    universal:
+      enabled: false
   purposesubtype:
     enabled: false
+    universal:
+      enabled: false
   bptStatusSch:
     enabled: false
-  crdintacctype:
-    enabled: false
+    universal:
+      enabled: false
   calendar:
     enabled: false
-  calendarItem:
+    universal:
+      enabled: false
+  calendaritem:
     enabled: false
+    universal:
+      enabled: false
   clearingsysreg:
     enabled: false
+    universal:
+      enabled: false
   bicexclusion:
     enabled: false
 request: