diff --git a/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/Namespaces/monitoring-origin/namespace.yml b/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/Namespaces/monitoring-origin/namespace.yml
index f00fc37a0..9bcb4ddc9 100644
--- a/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/Namespaces/monitoring-origin/namespace.yml
+++ b/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/Namespaces/monitoring-origin/namespace.yml
@@ -17,6 +17,10 @@ deployParameters:
   app_version: "3.0"
   ssl_enabled: true
   debug_mode_test: "true"
+  api_port: ${server_port}
+  service_version: ${app_version}
+  use_ssl: ${ssl_enabled}
+  log_level: ${debug_mode_test}
   ENVGENE_CONFIG_REF_NAME: "branch_name"
   ENVGENE_CONFIG_TAG: "No Ref tag"
   KMS_CERT_IN_BASE64: "${creds.get( \"kms-cert\" ).secret}" # paramset: test-deploy-creds version: 1 source: template
diff --git a/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/effective-set/cleanup/monitoring-origin/parameters.yaml b/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/effective-set/cleanup/monitoring-origin/parameters.yaml
index 66dd2aa24..3b281204b 100644
--- a/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/effective-set/cleanup/monitoring-origin/parameters.yaml
+++ b/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/effective-set/cleanup/monitoring-origin/parameters.yaml
@@ -77,6 +77,7 @@ api_config:
   connection:
     host: db.example.com
     port: 5432
+api_port: 8080
 app_version: '3.0'
 bss-app-exist: false
 core:
@@ -89,6 +90,7 @@ database_config:
     host: db.example.com
     port: 5432
 debug_mode_test: 'true'
+log_level: 'true'
 rendered_template: |-
   services:
     api:
@@ -96,7 +98,9 @@ rendered_template: |-
       ports:
         - 8080:8080
 server_port: 8080
+service_version: '3.0'
 ssl_enabled: true
+use_ssl: true
 yaml_template: |-
   services:
     api:
diff --git a/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/effective-set/deployment/monitoring-origin/MONITORING/values/deployment-parameters.yaml b/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/effective-set/deployment/monitoring-origin/MONITORING/values/deployment-parameters.yaml
index 66fd83c5d..2bf96010b 100644
--- a/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/effective-set/deployment/monitoring-origin/MONITORING/values/deployment-parameters.yaml
+++ b/build_effective_set_generator/effective-set-generator/src/test/resources/environments/cluster-01/pl-01/effective-set/deployment/monitoring-origin/MONITORING/values/deployment-parameters.yaml
@@ -78,6 +78,7 @@ api_config: &id001
   connection:
     host: db.example.com
     port: 5432
+api_port: 8080
 app_version: '3.0'
 bss-app-exist: false
 core: &id002
@@ -90,6 +91,7 @@ database_config: &id003
     host: db.example.com
     port: 5432
 debug_mode_test: 'true'
+log_level: 'true'
 rendered_template: |-
   services:
     api:
@@ -97,7 +99,9 @@ rendered_template: |-
       ports:
         - 8080:8080
 server_port: 8080
+service_version: '3.0'
 ssl_enabled: true
+use_ssl: true
 yaml_template: |-
   services:
     api:
@@ -182,11 +186,13 @@ global: &id004
   ZOOKEEPER_ADDRESS: zookeeper.zookeeper:2181
   ZOOKEEPER_URL: zookeeper.zookeeper:2181
   api_config: *id001
+  api_port: 8080
   app_version: '3.0'
   bss-app-exist: false
   core: *id002
   database_config: *id003
   debug_mode_test: 'true'
+  log_level: 'true'
   rendered_template: |-
     services:
       api:
@@ -194,7 +200,9 @@ global: &id004
         ports:
           - 8080:8080
   server_port: 8080
+  service_version: '3.0'
   ssl_enabled: true
+  use_ssl: true
   yaml_template: |-
     services:
       api: