diff --git a/jenkins/client/credential/vnf_onboarding.yml b/jenkins/client/credential/vnf_onboarding.yml
new file mode 100644
index 0000000..b668f31
--- /dev/null
+++ b/jenkins/client/credential/vnf_onboarding.yml
@@ -0,0 +1,14 @@
+parameters:
+
+  jenkins:
+    client:
+      credential:
+        test-openstack:
+          username: test
+          password: ${_param:vnf_openstack_test_user_password}
+        test-admin:
+          username: test-admin
+          password: ${_param:vnf_openstack_admin_user_password}
+        openstack-key:
+          username: root
+          key: ${_param:vnf_openstack_private_key}
diff --git a/jenkins/client/job/vnf-onboarding/deploy_cloudify.yml b/jenkins/client/job/vnf-onboarding/deploy_cloudify.yml
index 234178e..79d53aa 100644
--- a/jenkins/client/job/vnf-onboarding/deploy_cloudify.yml
+++ b/jenkins/client/job/vnf-onboarding/deploy_cloudify.yml
@@ -39,7 +39,7 @@
               default: "cloudify-enterprise"
             CFM_FLAVOR:
               type: string
-              default: "large"
+              default: "cfy.mngr"
             CFM_DISK_SIZE:
               type: string
               default: "80"
@@ -57,7 +57,16 @@
               default: "${_param:dns_server01}"
             CFM_SSH_KEY_ID:
               type: string
-              default: "openstack_key"
+              default: "openstack-key"
             EXTERNAL_NET:
               type: string
-              default: "public"
\ No newline at end of file
+              default: "public"
+            VNF_DOCKER_REGISTRY_PATH:
+              type: string
+              default: "${_param:vnf_docker_registry_path}"
+            VNF_DOCKER_CLI_TAG:
+              type: string
+              default: "latest"
+            VNF_DOCKER_CLI_PLATFORM:
+              type: string
+              default: "ubuntu"
\ No newline at end of file
diff --git a/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml b/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml
index 7caf52c..43586f7 100644
--- a/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml
+++ b/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml
@@ -87,20 +87,18 @@
               type: string
               description: "IP address of extrenal Cloudify. \"auto\" refers to address of deploy_cloudify job Cloudify instance"
               default: "auto"
+            CLOUDIFY_MANAGER_OPTIONS:
+              type: string
+              description: "Parameters for cloudify manager VM. Can be skipped if cloudify predeployed."
+              default: "CFM_IMAGE=cloudify-manager-4.3.1ga CFM_FLAVOR=cfy.mngr CFM_DISK_SIZE=80 CFM_SUBNET_CIDR=10.10.1.1/24 CFM_SUBNET_DNS=172.19.0.6 EXTERNAL_NET=public "
             CFM_SSH_KEY_ID:
               type: string
               description: "Credentials ID of ssh key for connection to Cloudify"
               default: "${_param:vnf_openstack_ssh_key_credentials}"
-            CFY_AGENT_NET:
+            CLOUDIFY_AGENT_OPTIONS:
               type: string
-              description: "Network for Cloudify agents that has access to Cloudify Manager"
-              default: "cfm-net-shared"
-            CFY_AGENT_FLAVOR:
-              type: string
-              default: "cfy.agent"
-            CFY_AGENT_IMAGE:
-              type: string
-              default: "ubuntu-xenial"
+              description: "Parameters for cloudify agent VMs."
+              default: "CFY_AGENT_NET=cfm-net-shared CFY_AGENT_FLAVOR=cfy.agent CFY_AGENT_BACKEND_FLAVOR=backend.avi CFY_AGENT_IMAGE=agent_vm CFY_AGENT_BASE_IMAGE=base_agent_vm CFY_AGENT_BACKEND_IMAGE=base_backend_vm"
             VNF_ARTIFACTORY_URL:
               type: string
               default: "${_param:vnf_artifactory_url}"
diff --git a/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml b/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml
index e27cc1b..8720fb1 100644
--- a/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml
+++ b/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml
@@ -85,20 +85,18 @@
                 type: string
                 description: "IP address of extrenal Cloudify. \"auto\" refers to address of deploy_cloudify job Cloudify instance"
                 default: "auto"
+              CLOUDIFY_MANAGER_OPTIONS:
+                type: string
+                description: "Parameters for cloudify manager VM. Can be skipped if cloudify predeployed."
+                default: "CFM_IMAGE=cloudify-manager-4.3.1ga CFM_FLAVOR=cfy.mngr CFM_DISK_SIZE=80 CFM_SUBNET_CIDR=10.10.1.1/24 CFM_SUBNET_DNS=172.19.0.6 EXTERNAL_NET=public "
               CFM_SSH_KEY_ID:
                 type: string
                 description: "Credentials ID of ssh key for connection to Cloudify"
                 default: "${_param:vnf_openstack_ssh_key_credentials}"
-              CFY_AGENT_NET:
+              CLOUDIFY_AGENT_OPTIONS:
                 type: string
-                description: "Network for Cloudify agents that has access to Cloudify Manager"
-                default: "cfm-net-shared"
-              CFY_AGENT_FLAVOR:
-                type: string
-                default: "cfy.agent"
-              CFY_AGENT_IMAGE:
-                type: string
-                default: "ubuntu-xenial"
+                description: "Parameters for cloudify agent VMs."
+                default: "CFY_AGENT_NET=cfm-net-shared CFY_AGENT_FLAVOR=cfy.agent CFY_AGENT_BACKEND_FLAVOR=backend.metaswitch CFY_AGENT_IMAGE=agent_vm CFY_AGENT_BASE_IMAGE=base_agent_vm CFY_AGENT_BACKEND_IMAGE=base_backend_vm"
               VNF_ARTIFACTORY_URL:
                 type: string
                 default: "${_param:vnf_artifactory_url}"
diff --git a/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml b/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml
index f5ca331..cdb073a 100644
--- a/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml
+++ b/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml
@@ -88,20 +88,18 @@
               type: string
               description: "IP address of extrenal Cloudify. \"auto\" refers to address of deploy_cloudify job Cloudify instance"
               default: "auto"
+            CLOUDIFY_MANAGER_OPTIONS:
+              type: string
+              description: "Parameters for cloudify manager VM. Can be skipped if cloudify predeployed."
+              default: "CFM_IMAGE=cloudify-manager-4.3.1ga CFM_FLAVOR=cfy.mngr CFM_DISK_SIZE=80 CFM_SUBNET_CIDR=10.10.1.1/24 CFM_SUBNET_DNS=172.19.0.6 EXTERNAL_NET=public "
             CFM_SSH_KEY_ID:
               type: string
               description: "Credentials ID of ssh key for connection to Cloudify"
               default: "${_param:vnf_openstack_ssh_key_credentials}"
-            CFY_AGENT_NET:
+            CLOUDIFY_AGENT_OPTIONS:
               type: string
-              description: "Network for Cloudify agents that has access to Cloudify Manager"
-              default: "cfm-net-shared"
-            CFY_AGENT_FLAVOR:
-              type: string
-              default: "cfy.agent"
-            CFY_AGENT_IMAGE:
-              type: string
-              default: "ubuntu-xenial"
+              description: "Parameters for cloudify agent VMs."
+              default: "CFY_AGENT_NET=cfm-net-shared CFY_AGENT_FLAVOR=cfy.agent CFY_AGENT_BACKEND_FLAVOR=backend.nginx CFY_AGENT_IMAGE=agent_vm CFY_AGENT_BASE_IMAGE=base_agent_vm CFY_AGENT_BACKEND_IMAGE=base_backend_vm"
             VNF_ARTIFACTORY_URL:
               type: string
               default: "${_param:vnf_artifactory_url}"