diff --git a/robot/resources/lib/storage.robot b/robot/resources/lib/storage.robot
index 841d3d5..35d10b9 100644
--- a/robot/resources/lib/storage.robot
+++ b/robot/resources/lib/storage.robot
@@ -9,7 +9,7 @@ Library     Process
 Drop object
     [Arguments]   ${NODE}    ${WIF_STORAGE}    ${CID}    ${OID}
 
-    ${DROP_SIMPLE} =        Run Process    neofs-cli control drop-objects -r ${NODE} --wif ${WIF_STORAGE} -o ${CID}/${OID}    shell=True
+    ${DROP_SIMPLE} =        Run Process    neofs-cli control drop-objects --endpoint ${NODE} --wif ${WIF_STORAGE} -o ${CID}/${OID}    shell=True
                             Log Many    stdout: ${DROP_SIMPLE.stdout}    stderr: ${DROP_SIMPLE.stderr}
                             Should Be Equal As Integers    ${DROP_SIMPLE.rc}    0
                             
diff --git a/robot/testsuites/integration/network/netmap_control.robot b/robot/testsuites/integration/network/netmap_control.robot
index 1464f56..53fef07 100644
--- a/robot/testsuites/integration/network/netmap_control.robot
+++ b/robot/testsuites/integration/network/netmap_control.robot
@@ -21,33 +21,33 @@ Control Operations with storage nodes
     ${NODE_NUM}    ${NODE}    ${WIF} =     Get control endpoint with wif    
     ${empty_list} =         Create List
 
-    ${SNAPSHOT} =           Run Process    neofs-cli control netmap-snapshot -r ${NODE} --wif ${WIF}    shell=True
-    ${HEALTHCHECK} =        Run Process    neofs-cli control healthcheck -r ${NODE} --wif ${WIF}    shell=True
+    ${SNAPSHOT} =           Run Process    neofs-cli control netmap-snapshot --endpoint ${NODE} --wif ${WIF}    shell=True
+    ${HEALTHCHECK} =        Run Process    neofs-cli control healthcheck --endpoint ${NODE} --wif ${WIF}    shell=True
                             Should Be Equal As Integers    ${HEALTHCHECK.rc}    0
 
-                            Run Process    neofs-cli control set-status -r ${NODE} --wif ${WIF} --status 'offline'    shell=True
+                            Run Process    neofs-cli control set-status --endpoint ${NODE} --wif ${WIF} --status 'offline'    shell=True
                             
                             Sleep    ${MAINNET_BLOCK_TIME}
                             Tick Epoch
 
-    ${SNAPSHOT_OFFLINE}=    Run Process    neofs-cli control netmap-snapshot -r ${NODE} --wif ${WIF}    shell=True
+    ${SNAPSHOT_OFFLINE}=    Run Process    neofs-cli control netmap-snapshot --endpoint ${NODE} --wif ${WIF}    shell=True
     ${NODE_NUM_OFFLINE}=    Get Regexp Matches        ${SNAPSHOT_OFFLINE.stdout}    ${NODE_NUM}
                             Should Be Equal    ${NODE_NUM_OFFLINE}    ${empty_list}
 
-    ${HEALTHCHECK_OFFLINE} =    Run Process    neofs-cli control healthcheck -r ${NODE} --wif ${WIF}    shell=True
+    ${HEALTHCHECK_OFFLINE} =    Run Process    neofs-cli control healthcheck --endpoint ${NODE} --wif ${WIF}    shell=True
                             Should Be Equal As Integers    ${HEALTHCHECK_OFFLINE.rc}    0
                             Should Not Be Equal    ${HEALTHCHECK.stdout}    ${HEALTHCHECK_OFFLINE.stdout} 
     
-                            Run Process    neofs-cli control set-status -r ${NODE} --wif ${WIF} --status 'online'    shell=True
+                            Run Process    neofs-cli control set-status --endpoint ${NODE} --wif ${WIF} --status 'online'    shell=True
 
                             Sleep    ${MAINNET_BLOCK_TIME}
                             Tick Epoch
 
-    ${SNAPSHOT_ONLINE} =    Run Process    neofs-cli control netmap-snapshot -r ${NODE} --wif ${WIF}    shell=True
+    ${SNAPSHOT_ONLINE} =    Run Process    neofs-cli control netmap-snapshot --endpoint ${NODE} --wif ${WIF}    shell=True
     ${NODE_NUM_ONLINE} =    Get Regexp Matches        ${SNAPSHOT_ONLINE.stdout}    ${NODE_NUM}    
                             Should Be Equal    ${NODE_NUM_ONLINE}[0]    ${NODE_NUM}
 
-    ${HEALTHCHECK_ONLINE} =    Run Process    neofs-cli control healthcheck -r ${NODE} --wif ${WIF}    shell=True
+    ${HEALTHCHECK_ONLINE} =    Run Process    neofs-cli control healthcheck --endpoint ${NODE} --wif ${WIF}    shell=True
                             Should Be Equal As Integers    ${HEALTHCHECK_ONLINE.rc}    0
                             Should Be Equal    ${HEALTHCHECK.stdout}    ${HEALTHCHECK_ONLINE.stdout}