diff --git a/robot/variables/common.py b/robot/variables/common.py
index e0e4be3e..10c22979 100644
--- a/robot/variables/common.py
+++ b/robot/variables/common.py
@@ -29,45 +29,50 @@ GAS_HASH = '0xd2a4cff31913016155e38e474a2c06d08be276cf'
 NEOFS_CONTRACT = os.getenv("NEOFS_IR_CONTRACTS_NEOFS")
 
 ASSETS_DIR = os.getenv("ASSETS_DIR", "TemporaryDir/")
+DEVENV_PATH = os.getenv("DEVENV_PATH", "../neofs-dev-env")
 
 MORPH_MAGIC = os.getenv("MORPH_MAGIC")
-S3_GATE_PUB_KEY = os.getenv("S3_GATE_PUB_KEY", '0313b1ac3a8076e155a7e797b24f0b650cccad5941ea59d7cfd51a024a8b2a06bf')
+S3_GATE_PUB_KEY = os.getenv("S3_GATE_PUB_KEY", "0313b1ac3a8076e155a7e797b24f0b650cccad5941ea59d7cfd51a024a8b2a06bf")
 
-DEVENV_SERVICES_PATH = os.getenv("DEVENV_SERVICES_PATH", f"{os.getenv('DEVENV_PATH')}/services")
+STORAGE_RPC_ENDPOINT_1 = os.getenv("STORAGE_RPC_ENDPOINT_1", "s01.neofs.devenv:8080")
+STORAGE_RPC_ENDPOINT_2 = os.getenv("STORAGE_RPC_ENDPOINT_2", "s02.neofs.devenv:8080")
+STORAGE_RPC_ENDPOINT_3 = os.getenv("STORAGE_RPC_ENDPOINT_3", "s03.neofs.devenv:8080")
+STORAGE_RPC_ENDPOINT_4 = os.getenv("STORAGE_RPC_ENDPOINT_4", "s04.neofs.devenv:8080")
 
-STORAGE_RPC_ENDPOINT_1 = os.getenv('STORAGE_RPC_ENDPOINT_1', os.getenv('DATA_NODE_1', 's01.neofs.devenv:8080'))
-STORAGE_RPC_ENDPOINT_2 = os.getenv('STORAGE_RPC_ENDPOINT_2', os.getenv('DATA_NODE_2', 's02.neofs.devenv:8080'))
-STORAGE_RPC_ENDPOINT_3 = os.getenv('STORAGE_RPC_ENDPOINT_3', os.getenv('DATA_NODE_3', 's03.neofs.devenv:8080'))
-STORAGE_RPC_ENDPOINT_4 = os.getenv('STORAGE_RPC_ENDPOINT_4', os.getenv('DATA_NODE_4', 's04.neofs.devenv:8080'))
+STORAGE_CONTROL_ENDPOINT_1 = os.getenv("STORAGE_CONTROL_ENDPOINT_1", "s01.neofs.devenv:8081")
+STORAGE_CONTROL_ENDPOINT_2 = os.getenv("STORAGE_CONTROL_ENDPOINT_2", "s02.neofs.devenv:8081")
+STORAGE_CONTROL_ENDPOINT_3 = os.getenv("STORAGE_CONTROL_ENDPOINT_3", "s03.neofs.devenv:8081")
+STORAGE_CONTROL_ENDPOINT_4 = os.getenv("STORAGE_CONTROL_ENDPOINT_4", "s04.neofs.devenv:8081")
 
-STORAGE_CONTROL_ENDPOINT_1 = os.getenv('STORAGE_CONTROL_ENDPOINT_1', os.getenv('NEOFS_CONTROL_NODE_1', 's01.neofs.devenv:8081'))
-STORAGE_CONTROL_ENDPOINT_2 = os.getenv('STORAGE_CONTROL_ENDPOINT_2', os.getenv('NEOFS_CONTROL_NODE_2', 's02.neofs.devenv:8081'))
-STORAGE_CONTROL_ENDPOINT_3 = os.getenv('STORAGE_CONTROL_ENDPOINT_3', os.getenv('NEOFS_CONTROL_NODE_3', 's03.neofs.devenv:8081'))
-STORAGE_CONTROL_ENDPOINT_4 = os.getenv('STORAGE_CONTROL_ENDPOINT_4', os.getenv('NEOFS_CONTROL_NODE_4', 's04.neofs.devenv:8081'))
+STORAGE_WALLET_PATH_1 = os.getenv("STORAGE_WALLET_PATH_1", f"{DEVENV_PATH}/services/storage/wallet01.json")
+STORAGE_WALLET_PATH_2 = os.getenv("STORAGE_WALLET_PATH_2", f"{DEVENV_PATH}/services/storage/wallet02.json")
+STORAGE_WALLET_PATH_3 = os.getenv("STORAGE_WALLET_PATH_3", f"{DEVENV_PATH}/services/storage/wallet03.json")
+STORAGE_WALLET_PATH_4 = os.getenv("STORAGE_WALLET_PATH_4", f"{DEVENV_PATH}/services/storage/wallet04.json")
+STORAGE_WALLET_PATH = STORAGE_WALLET_PATH_1
 
 NEOFS_NETMAP_DICT = {
     's01': {
         'rpc': STORAGE_RPC_ENDPOINT_1,
         'control': STORAGE_CONTROL_ENDPOINT_1,
-        'wallet_path':f"{DEVENV_SERVICES_PATH}/storage/wallet01.json",
+        'wallet_path': STORAGE_WALLET_PATH_1,
         'UN-LOCODE': 'RU MOW'
     },
     's02': {
         'rpc': STORAGE_RPC_ENDPOINT_2,
         'control': STORAGE_CONTROL_ENDPOINT_2,
-        'wallet_path': f"{DEVENV_SERVICES_PATH}/storage/wallet02.json",
+        'wallet_path': STORAGE_WALLET_PATH_2,
         'UN-LOCODE': 'RU LED'
     },
     's03': {
         'rpc': STORAGE_RPC_ENDPOINT_3,
         'control': STORAGE_CONTROL_ENDPOINT_3,
-        'wallet_path': f"{DEVENV_SERVICES_PATH}/storage/wallet03.json",
+        'wallet_path': STORAGE_WALLET_PATH_3,
         'UN-LOCODE': 'SE STO'
     },
     's04': {
         'rpc': STORAGE_RPC_ENDPOINT_4,
         'control': STORAGE_CONTROL_ENDPOINT_4,
-        'wallet_path': f"{DEVENV_SERVICES_PATH}/storage/wallet04.json",
+        'wallet_path': STORAGE_WALLET_PATH_4,
         'UN-LOCODE': 'FI HEL'
     },
 }
@@ -76,14 +81,13 @@ NEOGO_EXECUTABLE = os.getenv('NEOGO_EXECUTABLE', 'neo-go')
 NEOFS_CLI_EXEC = os.getenv('NEOFS_CLI_EXEC', 'neofs-cli')
 
 WALLET_CONFIG = f"{os.getcwd()}/neofs_cli_configs/empty_passwd.yml"
-MAINNET_WALLET_PATH = os.getenv("MAINNET_WALLET_PATH", f"{DEVENV_SERVICES_PATH}/chain/node-wallet.json")
+MAINNET_WALLET_PATH = os.getenv("MAINNET_WALLET_PATH", f"{DEVENV_PATH}/services/chain/node-wallet.json")
 MAINNET_WALLET_CONFIG = f"{os.getcwd()}/neofs_cli_configs/one_wallet_password.yml"
 MAINNET_SINGLE_ADDR = 'NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP'
 MAINNET_WALLET_PASS = 'one'
-IR_WALLET_PATH = os.getenv("IR_WALLET_PATH", f"{DEVENV_SERVICES_PATH}/ir/wallet01.json")
+IR_WALLET_PATH = os.getenv("IR_WALLET_PATH", f"{DEVENV_PATH}/services/ir/wallet01.json")
 IR_WALLET_CONFIG = f"{os.getcwd()}/neofs_cli_configs/one_wallet_password.yml"
 IR_WALLET_PASS = 'one'
-STORAGE_WALLET_PATH = f"{DEVENV_SERVICES_PATH}/storage/wallet01.json"
 
 STORAGE_NODE_USER = os.getenv('STORAGE_NODE_USER', 'root')
 STORAGE_NODE_PWD = os.getenv('STORAGE_NODE_PWD')