diff --git a/robot/assets/templates/sdnc/dnsscaling_preload.template b/robot/assets/templates/sdnc/dnsscaling_preload.template
index cf988d5..278ee80 100644
--- a/robot/assets/templates/sdnc/dnsscaling_preload.template
+++ b/robot/assets/templates/sdnc/dnsscaling_preload.template
@@ -15,16 +15,16 @@
             },
              "vnf-parameters": [
                 {
-                    "vnf-parameter-name": "repo_url",
-                    "vnf-parameter-value": "${repo_url}"
+                    "vnf-parameter-name": "repo_url_blob",
+                    "vnf-parameter-value": "${repo_url_blob}"
                 },
                 {
-                    "vnf-parameter-name": "repo_user",
-                    "vnf-parameter-value": "${repo_user}"
+                    "vnf-parameter-name": "repo_url_artifacts",
+                    "vnf-parameter-value": "${repo_url_artifacts}"
                 },
                 {
-                    "vnf-parameter-name": "repo_passwd",
-                    "vnf-parameter-value": "${repo_passwd}"
+                    "vnf-parameter-name": "demo_artifacts_version",
+                    "vnf-parameter-value": "${demo_artifacts_version}"
                 },
                 {
                     "vnf-parameter-name": "ecomp_private_net_id",
@@ -63,10 +63,6 @@
                     "vnf-parameter-value": "${scaling_vdns_name_0}"
                 },
                 {
-                    "vnf-parameter-name": "webserver_ip",
-                    "vnf-parameter-value": "${webserver_ip}"
-                },
-                {
                     "vnf-parameter-name": "dcae_collector_ip",
                     "vnf-parameter-value": "${dcae_collector_ip}"
                 },
diff --git a/robot/assets/templates/sdnc/vfw_preload.template b/robot/assets/templates/sdnc/vfw_preload.template
index c94c565..fbe96ca 100644
--- a/robot/assets/templates/sdnc/vfw_preload.template
+++ b/robot/assets/templates/sdnc/vfw_preload.template
@@ -15,16 +15,16 @@
             },
              "vnf-parameters": [
                 {
-                    "vnf-parameter-name": "repo_url",
-                    "vnf-parameter-value": "${repo_url}"
+                    "vnf-parameter-name": "repo_url_blob",
+                    "vnf-parameter-value": "${repo_url_blob}"
                 },
                 {
-                    "vnf-parameter-name": "repo_user",
-                    "vnf-parameter-value": "${repo_user}"
+                    "vnf-parameter-name": "repo_url_artifacts",
+                    "vnf-parameter-value": "${repo_url_artifacts}"
                 },
                 {
-                    "vnf-parameter-name": "repo_passwd",
-                    "vnf-parameter-value": "${repo_passwd}"
+                    "vnf-parameter-name": "demo_artifacts_version",
+                    "vnf-parameter-value": "${demo_artifacts_version}"
                 },
                 {
                     "vnf-parameter-name": "ecomp_private_net_id",
@@ -95,10 +95,6 @@
                     "vnf-parameter-value": "${vsn_name_0}"
                 },
                 {
-                    "vnf-parameter-name": "webserver_ip",
-                    "vnf-parameter-value": "${webserver_ip}"
-                },
-                {
                     "vnf-parameter-name": "dcae_collector_ip",
                     "vnf-parameter-value": "${dcae_collector_ip}"
                 },
diff --git a/robot/assets/templates/sdnc/vlb_preload.template b/robot/assets/templates/sdnc/vlb_preload.template
index 736f790..acc3c9d 100644
--- a/robot/assets/templates/sdnc/vlb_preload.template
+++ b/robot/assets/templates/sdnc/vlb_preload.template
@@ -15,16 +15,16 @@
             },
              "vnf-parameters": [
                 {
-                    "vnf-parameter-name": "repo_url",
-                    "vnf-parameter-value": "${repo_url}"
+                    "vnf-parameter-name": "repo_url_blob",
+                    "vnf-parameter-value": "${repo_url_blob}"
                 },
                 {
-                    "vnf-parameter-name": "repo_user",
-                    "vnf-parameter-value": "${repo_user}"
+                    "vnf-parameter-name": "repo_url_artifacts",
+                    "vnf-parameter-value": "${repo_url_artifacts}"
                 },
                 {
-                    "vnf-parameter-name": "repo_passwd",
-                    "vnf-parameter-value": "${repo_passwd}"
+                    "vnf-parameter-name": "demo_artifacts_version",
+                    "vnf-parameter-value": "${demo_artifacts_version}"
                 },
                 {
                     "vnf-parameter-name": "ecomp_private_net_id",
@@ -71,10 +71,6 @@
                     "vnf-parameter-value": "${vdns_name_0}"
                 },
                 {
-                    "vnf-parameter-name": "webserver_ip",
-                    "vnf-parameter-value": "${webserver_ip}"
-                },
-                {
                     "vnf-parameter-name": "dcae_collector_ip",
                     "vnf-parameter-value": "${dcae_collector_ip}"
                 },