diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index f79a4d3462f4e2af771ddaef50b95c1d304010b0..547e487e3ddf87032d7ef99834d895a75bbcb3e5 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -2,7 +2,7 @@
 ${NFVO_HOST}    172.21.248.145    # Hostname of the NFVO
 ${NFVO_PORT}    9999    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer lTxE0BXRcVPjlIUwHLVH5Dtjl39sZ9qp 
+${AUTHORIZATION}    Bearer u5JGp5D3k7m1VUlrCa39k8WX15em149q 
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
 ${apiRoot}        /osm/
@@ -14,7 +14,7 @@ ${FIELD_USAGE}    1
 ${NFVO_AUTHENTICATION}    Bearer isDGF7TiifGUgzeNb0Fls9aatfZRy4iX #never referenced
 ${NFVO_AUTH_USAGE}    1 #never refernced
 
-${MOCK_SERVER_JAR}    ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
 ${callback_port}    9091
 ${callback_uri}    http://172.22.1.7:${callback_port}
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index 9092991e18f3d77c9af4d5c115d96e77bf383ecd..ae2915934654b47364b067847db209ac4eb6906b 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -24,4 +24,14 @@ NS Instance Creation
     Check HTTP Response Body Json Schema Is    NsIdentifierCreationNotification
     Check resource not_instantiated
     
-    
\ No newline at end of file
+NS Instance Creation with DISABLED nsd
+    [Documentation]    Test ID: 5.3.2.18.2
+    ...    Test title: NS Instance Creation with DISABLED nsd
+    ...    Test objective: The objective is to test the workflow for Creating a NS instance with a disabled NSD
+    ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in disabled operational state.
+    ...    Reference: Clauses 6.4.2.3.1 and 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST New nsInstance with DISABLED nsd
+    Check HTTP Response Status Code Is    409
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 26c63494ef9de1321b315f28fb6b958ff3912b53..49c77d238ed337e560a756903c061c6099d6aa82 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -223,6 +223,17 @@ POST New nsInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}     
 
+POST New nsInstance with DISABLED nsd
+    Log    Create NS instance by POST to ${apiRoot}/${apiName}/${apiVersion}/ns_instances
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/CreateNsRequest.json 
+    ${body}=        Format String   ${template}     nsdId=${disabledNsdId}   nsInstanceName=${nsInstanceName}   vimAccountId=${vimAccountId}   nsInstanceDescription=${nsInstanceDescription}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}  
+
 GET NsInstances
     Log    Query NS The GET method queries information about multiple NS instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index cec5cabbc4d5fcdd32b93518db190b98ae1e759c..b9a2ab988f9aba6f06ed144ccd7aee830c587b1f 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -6,7 +6,7 @@ ${NFVO_PORT}      9999    # Listening port of the NFVO
 ${VNFM_SCHEMA}    https
 ${NFVO_SCHEMA}    https
 
-${AUTHORIZATION}    Bearer    RW6sV6rtFa3TUEdazW4Dyd66muED2kBA
+${AUTHORIZATION}    Bearer    v1qDEucqjIZSua6t4R40sraMZafJxEKb
 ${CONTENT_TYPE}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT_JSON}         application/json
@@ -17,6 +17,7 @@ ${apiVersion}     v1
 ${AUTH_USAGE}     1
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
 ${nsdId}                9e708376-4f96-4972-89c2-243760626f20
+${disabledNsdId}        9e708376-4f96-4972-89c2-243760626f20
 ${nsInstanceId}         bef2ab38-d117-4f29-bb07-0b02508575a9
 ${ConflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
 ${nsInstanceName}    Test-nsInstance