diff --git a/glance/client/image/vnf_onboarding/avi_loadbalancer.yml b/glance/client/image/vnf_onboarding/avi_loadbalancer.yml
new file mode 100644
index 0000000..3061d60
--- /dev/null
+++ b/glance/client/image/vnf_onboarding/avi_loadbalancer.yml
@@ -0,0 +1,22 @@
+classes:
+- system.glance.client
+parameters:
+  _param:
+    avi_control_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_avi_control_image_name}.qcow2"
+    avi_control_image_name:  "${_param:vnf_avi_control_image_name}"
+  glance:
+    client:
+      identity:
+        admin_identity:
+          endpoint_type: internalURL
+          image:
+            avi:
+              name: ${_param:avi_control_image_name}
+              location: ${_param:avi_control_image_url}
+              import_from_format: 'qcow2'
+              container_format: 'bare'
+              disk_format: 'qcow2'
+              tags:
+                - 'avi'
+              visibility: public
+              wait_timeout: 1000
diff --git a/glance/client/image/vnf_onboarding/init.yml b/glance/client/image/vnf_onboarding/init.yml
new file mode 100644
index 0000000..7d57ca6
--- /dev/null
+++ b/glance/client/image/vnf_onboarding/init.yml
@@ -0,0 +1,71 @@
+classes:
+- system.glance.client
+parameters:
+  _param:
+    cloudify_enterprise_manager_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_cloudify_enterprise_manager_image_name}.qcow2"
+    cloudify_enterprise_manager_image_name:  "${_param:vnf_cloudify_enterprise_manager_image_name}"
+    cloudify_community_manager_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_cloudify_community_manager_image_name}.qcow2"
+    cloudify_community_manager_image_name: "${_param:vnf_cloudify_community_manager_image_name}"
+    agent_vm_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_agent_vm_image_name}.img"
+    agent_vm_image_name:  "${_param:vnf_agent_vm_image_name}"
+    base_agent_vm_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_base_agent_vm_image_name}.qcow2"
+    base_agent_vm_image_name:  "${_param:vnf_base_agent_vm_image_name}"
+    base_backend_vm_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_base_backend_vm_image_name}.qcow2"
+    base_backend_vm_image_name:  "${_param:vnf_base_backend_vm_image_name}"
+  glance:
+    client:
+      identity:
+        admin_identity:
+          endpoint_type: internalURL
+          image:
+            agent_vm:
+              name: ${_param:agent_vm_image_name}
+              location: ${_param:agent_vm_image_url}
+              import_from_format: 'qcow2'
+              container_format: 'bare'
+              disk_format: 'qcow2'
+              tags:
+                - 'vnf-onboarding'
+              visibility: public
+              wait_timeout: 1000
+            base_agent_vm:
+              name: ${_param:base_agent_vm_image_name}
+              location: ${_param:base_agent_vm_image_url}
+              import_from_format: 'qcow2'
+              container_format: 'bare'
+              disk_format: 'qcow2'
+              tags:
+                - 'vnf-onboarding'
+              visibility: public
+              wait_timeout: 1000
+            base_backend_vm:
+              name: ${_param:base_backend_vm_image_name}
+              location: ${_param:base_backend_vm_image_url}
+              import_from_format: 'qcow2'
+              container_format: 'bare'
+              disk_format: 'qcow2'
+              tags:
+                - 'vnf-onboarding'
+              visibility: public
+              wait_timeout: 1000
+            cloudify-enterprise:
+              name: ${_param:cloudify_enterprise_manager_image_name}
+              location: ${_param:cloudify_enterprise_manager_image_url}
+              import_from_format: 'qcow2'
+              container_format: 'bare'
+              disk_format: 'qcow2'
+              tags:
+                - 'vnf-onboarding'
+              visibility: public
+              wait_timeout: 1000
+            cloudify-community:
+              name: ${_param:cloudify_community_manager_image_name}
+              location: ${_param:cloudify_community_manager_image_url}
+              import_from_format: 'qcow2'
+              container_format: 'bare'
+              disk_format: 'qcow2'
+              tags:
+                - 'vnf-onboarding'
+              visibility: public
+              wait_timeout: 1000
+
diff --git a/glance/client/image/vnf_onboarding/metaswitch.yml b/glance/client/image/vnf_onboarding/metaswitch.yml
new file mode 100644
index 0000000..6b3d387
--- /dev/null
+++ b/glance/client/image/vnf_onboarding/metaswitch.yml
@@ -0,0 +1,46 @@
+classes:
+- system.glance.client
+parameters:
+  _param:
+    metaswitch_dcm_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_metaswitch_dcm_image_name}.qcow2"
+    metaswitch_dcm_image_name:  "${_param:vnf_metaswitch_dcm_image_name}"
+    metaswitch_mdm_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_metaswitch_mdm_image_name}.qcow2"
+    metaswitch_mdm_image_name:  "${_param:vnf_metaswitch_mdm_image_name}"
+    metaswitch_perimeta_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_metaswitch_perimeta_image_name}.qcow2"
+    metaswitch_perimeta_image_name:  "${_param:vnf_metaswitch_perimeta_image_name}"
+  glance:
+    client:
+      identity:
+        admin_identity:
+          endpoint_type: internalURL
+          image:
+            metaswitch-dcm:
+              name: ${_param:metaswitch_dcm_image_name}
+              location: ${_param:metaswitch_dcm_image_url}
+              import_from_format: 'qcow2'
+              container_format: 'bare'
+              disk_format: 'qcow2'
+              tags:
+                - 'metaswitch'
+              visibility: public
+              wait_timeout: 1000
+            metaswitch-mdm:
+              name: ${_param:metaswitch_mdm_image_name}
+              location: ${_param:metaswitch_mdm_image_url}
+              import_from_format: 'qcow2'
+              container_format: 'bare'
+              disk_format: 'qcow2'
+              tags:
+                - 'metaswitch'
+              visibility: public
+              wait_timeout: 1000
+            metaswitch-perimeta:
+              name: ${_param:metaswitch_perimeta_image_name}
+              location: ${_param:metaswitch_perimeta_image_url}
+              import_from_format: 'qcow2'
+              container_format: 'bare'
+              disk_format: 'qcow2'
+              tags:
+                - 'metaswitch'
+              visibility: public
+              wait_timeout: 1000
\ No newline at end of file