diff --git a/robot/resources/aai/create_service.robot b/robot/resources/aai/create_service.robot
index 1c036ec..4376484 100644
--- a/robot/resources/aai/create_service.robot
+++ b/robot/resources/aai/create_service.robot
@@ -64,6 +64,7 @@
     [Arguments]    ${service_description}
 	${resp}=    AAI.Run Get Request     ${AAI_FRONTEND_ENDPOINT}    ${INDEX PATH}${ROOT_SERVICE_PATH}        auth=${GLOBAL_AAI_AUTHENTICATION}
 	${resp_json}=  Set Variable  ${resp.json()}
+    ${id}=  Set Variable
     @{list}=  Copy List   ${resp_json['service']}
     :FOR   ${map}    IN    @{list}
     \    ${service_type}=    Get From Dictionary    ${map}    service-description
diff --git a/robot/resources/test_templates/pnf_orchestration_test_template.robot b/robot/resources/test_templates/pnf_orchestration_test_template.robot
index 6ecd2a0..c46e74b 100644
--- a/robot/resources/test_templates/pnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/pnf_orchestration_test_template.robot
@@ -36,6 +36,11 @@
 Orchestrate PNF Building Block Flow
     [Documentation]   Use ONAP to Orchestrate a PNF using GR api
     [Arguments]   ${service_model_name}  ${customer_name}    ${service}    ${product_family}    ${pnf_correlation_id}   ${region}   ${owning_entity}  ${owningEntityId}  ${project_name}=Project-Demonstration  ${lineOfBusinessName}=LOB-Demonstration    ${platformName}=Platform-Demonstration
+    ${uuid}=   Generate UUID4
+    ${full_customer_name}=    Catenate    ${customer_name}_${uuid}
+    ${service_name}=    Catenate    Service_Ete_Name${uuid}
+    ${service_type}=    Set Variable    ${service}
+    Create Customer For PNF     ${full_customer_name}    ${full_customer_name}     INFRA    ${service_type}    ${GLOBAL_AAI_CLOUD_OWNER}  ${tenant_id}  ${region}
     ${json_resp}=  Get Service Catalog  ${service_model_name}
     ${service_model_uuid}=  Set Variable  ${json_resp["uuid"]}
     ${service_model_invariant_uuid }=  Set Variable  ${json_resp["invariantUUID"]}
@@ -47,11 +52,6 @@
     ${nf_model_uuid}=  Set Variable  ${json_resp["uuid"]}
     ${nf_model_name}=  Set Variable  ${json_resp["name"]}
     ${productFamilyId}=  Get Service Id  ${product_family}
-    ${uuid}=   Generate UUID4
-    ${full_customer_name}=    Catenate    ${customer_name}_${uuid}
-    ${service_name}=    Catenate    Service_Ete_Name${uuid}
-    ${service_type}=    Set Variable    ${service}
-    Create Customer For PNF     ${full_customer_name}    ${full_customer_name}     INFRA    ${service_type}    ${GLOBAL_AAI_CLOUD_OWNER}  ${tenant_id}  ${region}
     ${arguments}=    Create Dictionary   service_model_invariant_uuid=${service_model_invariant_uuid}
     Set To Dictionary  ${arguments}  service_model_uuid  ${service_model_uuid}
     Set To Dictionary  ${arguments}  service_model_name  ${service_model_name}