diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index bddaad4..1847a61 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -206,7 +206,7 @@
            default='{}/openstack-docker/remote_storage_adapter:latest'.format(
                settings.DOCKER_REGISTRY)),
     # SalesForce connection options for pushkin
-    ct.Cfg('sfdc_sandbox_enabled', ct.String(), default=False),
+    ct.Cfg('sfdc_sandbox_enabled', ct.String(), default='False'),
     ct.Cfg('sfdc_auth_url', ct.String(), default=''),
     ct.Cfg('sfdc_username', ct.String(), default=''),
     ct.Cfg('sfdc_password', ct.String(), default=''),
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay.yaml b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay.yaml
index e2a4ce1..38db286 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay.yaml
@@ -520,8 +520,8 @@
           - name: {{ HOSTNAME_PRX01 }}
             role: salt_minion
             params:
-              vcpu: {{ os_env('MON_NODE_CPU', 1) }}
-              memory: {{ os_env('MON_NODE_MEMORY', 2048) }}
+              vcpu: {{ os_env('PRX_NODE_CPU', 1) }}
+              memory: {{ os_env('PRX_NODE_MEMORY', 2048) }}
               boot:
                 - hd
               cloud_init_volume_name: iso