-${k8scluster_name} k8sbasic_22
-${k8scluster_version} v1
-${username} ubuntu
-${password} ${EMPTY}
-${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${action_name} touch
-${ns_timeout} 15min
+${K8SCLUSTER_NAME} k8sbasic_22
+${K8SCLUSTER_VERSION} v1
+
+# NS and VNF descriptor package folder and ids
+${VNFD_PKG1} charm-packages/cmr_relation_vnf
+${VNFD_PKG2} charm-packages/cmr_no_relation_vnf
+${NSD_PKG} charm-packages/cmr_relation_ns
+${VNFD_NAME1} cross_model_relation-vnf
+${VNFD_NAME2} cross_model_no_relation-vnf
+${NSD_NAME} cross_model_relation-ns
+
+# NS instance name and configuration
+${NS_NAME} basic_22
+${NS_CONFIG} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${NS_TIMEOUT} 15min
+
+# SSH keys and username to be used
+${PUBLICKEY} %{HOME}/.ssh/id_rsa.pub
+${PRIVATEKEY} %{HOME}/.ssh/id_rsa
+${USERNAME} ubuntu
+${PASSWORD} ${EMPTY}