diff --git a/core/model/src/payment.rs b/core/model/src/payment.rs
index 916e81e324..d92e4a8fba 100644
--- a/core/model/src/payment.rs
+++ b/core/model/src/payment.rs
@@ -500,8 +500,8 @@ pub mod local {
     #[serde(rename_all = "lowercase")]
     #[non_exhaustive]
     pub enum DriverName {
+        Erc20Next,
         Erc20,
-        Erc20legacy,
     }
 
     #[derive(StructOpt, Debug, Clone)]
diff --git a/core/payment-driver/erc20/src/lib.rs b/core/payment-driver/erc20/src/lib.rs
index aaa7532d90..4cbe2ce4cd 100644
--- a/core/payment-driver/erc20/src/lib.rs
+++ b/core/payment-driver/erc20/src/lib.rs
@@ -5,35 +5,35 @@
 */
 
 // Public
-pub const DRIVER_NAME: &str = "erc20legacy";
+pub const DRIVER_NAME: &str = "erc20";
 
 pub const RINKEBY_NETWORK: &str = "rinkeby";
 pub const RINKEBY_TOKEN: &str = "tGLM";
-pub const RINKEBY_PLATFORM: &str = "erc20legacy-rinkeby-tglm";
+pub const RINKEBY_PLATFORM: &str = "erc20-rinkeby-tglm";
 pub const RINKEBY_CURRENCY_SHORT: &str = "tETH";
 pub const RINKEBY_CURRENCY_LONG: &str = "Rinkeby Ether";
 
 pub const GOERLI_NETWORK: &str = "goerli";
 pub const GOERLI_TOKEN: &str = "tGLM";
-pub const GOERLI_PLATFORM: &str = "erc20legacy-goerli-tglm";
+pub const GOERLI_PLATFORM: &str = "erc20-goerli-tglm";
 pub const GOERLI_CURRENCY_SHORT: &str = "tETH";
 pub const GOERLI_CURRENCY_LONG: &str = "Goerli Ether";
 
 pub const MUMBAI_NETWORK: &str = "mumbai";
 pub const MUMBAI_TOKEN: &str = "tGLM";
-pub const MUMBAI_PLATFORM: &str = "erc20legacy-mumbai-tglm";
+pub const MUMBAI_PLATFORM: &str = "erc20-mumbai-tglm";
 pub const MUMBAI_CURRENCY_SHORT: &str = "tMATIC";
 pub const MUMBAI_CURRENCY_LONG: &str = "Test MATIC";
 
 pub const MAINNET_NETWORK: &str = "mainnet";
 pub const MAINNET_TOKEN: &str = "GLM";
-pub const MAINNET_PLATFORM: &str = "erc20legacy-mainnet-glm";
+pub const MAINNET_PLATFORM: &str = "erc20-mainnet-glm";
 pub const MAINNET_CURRENCY_SHORT: &str = "ETH";
 pub const MAINNET_CURRENCY_LONG: &str = "Ether";
 
 pub const POLYGON_MAINNET_NETWORK: &str = "polygon";
 pub const POLYGON_MAINNET_TOKEN: &str = "GLM";
-pub const POLYGON_MAINNET_PLATFORM: &str = "erc20legacy-polygon-glm";
+pub const POLYGON_MAINNET_PLATFORM: &str = "erc20-polygon-glm";
 pub const POLYGON_MAINNET_CURRENCY_SHORT: &str = "MATIC";
 pub const POLYGON_MAINNET_CURRENCY_LONG: &str = "Polygon";
 
diff --git a/core/payment-driver/erc20next/Readme.md b/core/payment-driver/erc20next/Readme.md
index f5434615af..e44e2b8330 100644
--- a/core/payment-driver/erc20next/Readme.md
+++ b/core/payment-driver/erc20next/Readme.md
@@ -8,7 +8,7 @@ This command will send 0.0001 GLMs from internal wallet to address 0x89Ef977db64
 Note that service have to be running otherwise you get no connection error.
 
 ```
-yagna.exe payment transfer --amount 0.0001 --driver erc20 --network mumbai --to-address 0x89Ef977db64A2597bA57E3eb4b717D3bAAeBaeC3
+yagna.exe payment transfer --amount 0.0001 --driver erc20next --network mumbai --to-address 0x89Ef977db64A2597bA57E3eb4b717D3bAAeBaeC3
 ```
 
 You can specify extra options 
@@ -17,7 +17,7 @@ You can specify extra options
 * --gas-limit (limit of gas used in transaction). Better to leave default as it is not affecting cost of transaction. This is convenient for testing errors on blockchain.
 
 ```
-yagna.exe payment transfer --amount 0.0001 --gas-price 1.1 --max-gas-price 60.4 --gas-limit 80000 --driver erc20 --network mumbai --to-address 0x89Ef977db64A2597bA57E3eb4b717D3bAAeBaeC3
+yagna.exe payment transfer --amount 0.0001 --gas-price 1.1 --max-gas-price 60.4 --gas-limit 80000 --driver erc20next --network mumbai --to-address 0x89Ef977db64A2597bA57E3eb4b717D3bAAeBaeC3
 ```
 
 Networks currently supported:
diff --git a/core/payment-driver/erc20next/src/driver.rs b/core/payment-driver/erc20next/src/driver.rs
index 8dcf111da5..91db7f5552 100644
--- a/core/payment-driver/erc20next/src/driver.rs
+++ b/core/payment-driver/erc20next/src/driver.rs
@@ -1,5 +1,5 @@
 /*
-    Erc20Driver to handle payments on the erc20 network.
+    Erc20Driver to handle payments on the erc20next network.
 
     Please limit the logic in this file, use local mods to handle the calls.
 */
diff --git a/core/payment-driver/erc20next/src/erc20/mod.rs b/core/payment-driver/erc20next/src/erc20/mod.rs
index 5900681925..20cad822d0 100644
--- a/core/payment-driver/erc20next/src/erc20/mod.rs
+++ b/core/payment-driver/erc20next/src/erc20/mod.rs
@@ -1,5 +1,5 @@
 /*
-    Private mod to encapsulate all erc20 logic, revealed from the `wallet`.
+    Private mod to encapsulate all erc20next logic, revealed from the `wallet`.
 */
 
 pub mod ethereum;
diff --git a/core/payment-driver/erc20next/src/erc20/wallet.rs b/core/payment-driver/erc20next/src/erc20/wallet.rs
index 5f15af6517..2d40040316 100644
--- a/core/payment-driver/erc20next/src/erc20/wallet.rs
+++ b/core/payment-driver/erc20next/src/erc20/wallet.rs
@@ -1,5 +1,5 @@
 /*
-    Wallet functions on erc20.
+    Wallet functions on erc20next.
 */
 
 // External crates
diff --git a/core/payment-driver/erc20next/src/lib.rs b/core/payment-driver/erc20next/src/lib.rs
index d504ff5926..f94eb5ce85 100644
--- a/core/payment-driver/erc20next/src/lib.rs
+++ b/core/payment-driver/erc20next/src/lib.rs
@@ -1,39 +1,39 @@
 /*
-    Payment driver for yagna using erc20.
+    Payment driver for yagna using erc20next.
 
     This file only contains constants and imports.
 */
 
 // Public
-pub const DRIVER_NAME: &str = "erc20";
+pub const DRIVER_NAME: &str = "erc20next";
 
 pub const RINKEBY_NETWORK: &str = "rinkeby";
 pub const RINKEBY_TOKEN: &str = "tGLM";
-pub const RINKEBY_PLATFORM: &str = "erc20-rinkeby-tglm";
+pub const RINKEBY_PLATFORM: &str = "erc20next-rinkeby-tglm";
 pub const RINKEBY_CURRENCY_SHORT: &str = "tETH";
 pub const RINKEBY_CURRENCY_LONG: &str = "Rinkeby Ether";
 
 pub const GOERLI_NETWORK: &str = "goerli";
 pub const GOERLI_TOKEN: &str = "tGLM";
-pub const GOERLI_PLATFORM: &str = "erc20-goerli-tglm";
+pub const GOERLI_PLATFORM: &str = "erc20next-goerli-tglm";
 pub const GOERLI_CURRENCY_SHORT: &str = "tETH";
 pub const GOERLI_CURRENCY_LONG: &str = "Goerli Ether";
 
 pub const MUMBAI_NETWORK: &str = "mumbai";
 pub const MUMBAI_TOKEN: &str = "tGLM";
-pub const MUMBAI_PLATFORM: &str = "erc20-mumbai-tglm";
+pub const MUMBAI_PLATFORM: &str = "erc20next-mumbai-tglm";
 pub const MUMBAI_CURRENCY_SHORT: &str = "tMATIC";
 pub const MUMBAI_CURRENCY_LONG: &str = "Test MATIC";
 
 pub const MAINNET_NETWORK: &str = "mainnet";
 pub const MAINNET_TOKEN: &str = "GLM";
-pub const MAINNET_PLATFORM: &str = "erc20-mainnet-glm";
+pub const MAINNET_PLATFORM: &str = "erc20next=mainnet-glm";
 pub const MAINNET_CURRENCY_SHORT: &str = "ETH";
 pub const MAINNET_CURRENCY_LONG: &str = "Ether";
 
 pub const POLYGON_MAINNET_NETWORK: &str = "polygon";
 pub const POLYGON_MAINNET_TOKEN: &str = "GLM";
-pub const POLYGON_MAINNET_PLATFORM: &str = "erc20-polygon-glm";
+pub const POLYGON_MAINNET_PLATFORM: &str = "erc20next-polygon-glm";
 pub const POLYGON_MAINNET_CURRENCY_SHORT: &str = "MATIC";
 pub const POLYGON_MAINNET_CURRENCY_LONG: &str = "Polygon";
 
diff --git a/core/payment/README.md b/core/payment/README.md
index ed154e566b..f993a69fdb 100644
--- a/core/payment/README.md
+++ b/core/payment/README.md
@@ -7,8 +7,8 @@ The payments are made by drivers loaded in the service.
 ### Drivers
 
 Currently these drivers are available to use:
+- Erc20Next
 - Erc20
-- Erc20Legacy
 - Dummy
 
 By default only the Erc20 & Erc20Next drivers are enabled, extra drivers need to be specifically loaded with a feature flag.
@@ -25,7 +25,7 @@ You can enable multiple drivers at the same time, use this table for the require
 
 ### Examples:
 
-Build with erc20 and erc20legacy drivers:
+Build with erc20next and erc20 drivers:
 ```
 cargo build --release
 ```
\ No newline at end of file
diff --git a/core/payment/examples/payment_api.rs b/core/payment/examples/payment_api.rs
index 29d890e2e2..5c98c669e2 100644
--- a/core/payment/examples/payment_api.rs
+++ b/core/payment/examples/payment_api.rs
@@ -46,8 +46,8 @@ impl FromStr for Driver {
     fn from_str(s: &str) -> anyhow::Result<Self> {
         match s.to_lowercase().as_str() {
             "dummy" => Ok(Driver::Dummy),
-            "erc20legacy" => Ok(Driver::Erc20),
-            "erc20" => Ok(Driver::Erc20next),
+            "erc20" => Ok(Driver::Erc20),
+            "erc20next" => Ok(Driver::Erc20next),
             s => Err(anyhow::Error::msg(format!("Invalid driver: {}", s))),
         }
     }
@@ -57,8 +57,8 @@ impl std::fmt::Display for Driver {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Driver::Dummy => write!(f, "dummy"),
-            Driver::Erc20 => write!(f, "erc20legacy"),
-            Driver::Erc20next => write!(f, "erc20"),
+            Driver::Erc20 => write!(f, "erc20"),
+            Driver::Erc20next => write!(f, "erc20next"),
         }
     }
 }
diff --git a/golem_cli/src/command/yagna.rs b/golem_cli/src/command/yagna.rs
index d238cb4906..14aa09f237 100644
--- a/golem_cli/src/command/yagna.rs
+++ b/golem_cli/src/command/yagna.rs
@@ -33,40 +33,40 @@ lazy_static! {
         erc20.insert(
             NetworkName::Mainnet.into(),
             PaymentPlatform {
-                platform: "erc20legacy-mainnet-glm",
-                driver: "erc20legacy",
+                platform: "erc20-mainnet-glm",
+                driver: "erc20",
                 token: "GLM",
             },
         );
         erc20.insert(
             NetworkName::Rinkeby.into(),
             PaymentPlatform {
-                platform: "erc20legacy-rinkeby-tglm",
-                driver: "erc20legacy",
+                platform: "erc20-rinkeby-tglm",
+                driver: "erc20",
                 token: "tGLM",
             },
         );
         erc20.insert(
             NetworkName::Goerli.into(),
             PaymentPlatform {
-                platform: "erc20legacy-goerli-tglm",
-                driver: "erc20legacy",
+                platform: "erc20-goerli-tglm",
+                driver: "erc20",
                 token: "tGLM",
             },
         );
         erc20.insert(
             NetworkName::Mumbai.into(),
             PaymentPlatform {
-                platform: "erc20legacy-mumbai-tglm",
-                driver: "erc20legacy",
+                platform: "erc20-mumbai-tglm",
+                driver: "erc20",
                 token: "tGLM",
             },
         );
         erc20.insert(
             NetworkName::Polygon.into(),
             PaymentPlatform {
-                platform: "erc20legacy-polygon-glm",
-                driver: "erc20legacy",
+                platform: "erc20-polygon-glm",
+                driver: "erc20",
                 token: "GLM",
             },
         );
@@ -81,47 +81,47 @@ lazy_static! {
         erc20next.insert(
             NetworkName::Mainnet.into(),
             PaymentPlatform {
-                platform: "erc20-mainnet-glm",
-                driver: "erc20",
+                platform: "erc20next-mainnet-glm",
+                driver: "erc20next",
                 token: "GLM",
             },
         );
         erc20next.insert(
             NetworkName::Rinkeby.into(),
             PaymentPlatform {
-                platform: "erc20-rinkeby-tglm",
-                driver: "erc20",
+                platform: "erc20next-rinkeby-tglm",
+                driver: "erc20next",
                 token: "tGLM",
             },
         );
         erc20next.insert(
             NetworkName::Goerli.into(),
             PaymentPlatform {
-                platform: "erc20-goerli-tglm",
-                driver: "erc20",
+                platform: "erc20next-goerli-tglm",
+                driver: "erc20next",
                 token: "tGLM",
             },
         );
         erc20next.insert(
             NetworkName::Mumbai.into(),
             PaymentPlatform {
-                platform: "erc20-mumbai-tglm",
-                driver: "erc20",
+                platform: "erc20next-mumbai-tglm",
+                driver: "erc20next",
                 token: "tGLM",
             },
         );
         erc20next.insert(
             NetworkName::Polygon.into(),
             PaymentPlatform {
-                platform: "erc20-polygon-glm",
-                driver: "erc20",
+                platform: "erc20next-polygon-glm",
+                driver: "erc20next",
                 token: "GLM",
             },
         );
 
         PaymentDriver {
             platforms: erc20next,
-            name: "erc20",
+            name: "erc20next",
         }
     };
     pub static ref DRIVERS: Vec<&'static PaymentDriver> = vec![&ERC20_DRIVER];
diff --git a/goth_tests/poetry.lock b/goth_tests/poetry.lock
index 13a0707f60..0ce98aa9ee 100644
--- a/goth_tests/poetry.lock
+++ b/goth_tests/poetry.lock
@@ -1,9 +1,10 @@
-# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.4.1 and should not be changed by hand.
 
 [[package]]
 name = "aiohttp"
 version = "3.8.5"
 description = "Async http client/server framework (asyncio)"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -112,6 +113,7 @@ speedups = ["Brotli", "aiodns", "cchardet"]
 name = "aiosignal"
 version = "1.3.1"
 description = "aiosignal: a list of registered asynchronous callbacks"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -126,6 +128,7 @@ frozenlist = ">=1.1.0"
 name = "ansicolors"
 version = "1.1.8"
 description = "ANSI colors for Python"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -137,6 +140,7 @@ files = [
 name = "appdirs"
 version = "1.4.4"
 description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -148,6 +152,7 @@ files = [
 name = "asgiref"
 version = "3.3.4"
 description = "ASGI specs, helper code, and adapters"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -162,6 +167,7 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"]
 name = "async-timeout"
 version = "4.0.3"
 description = "Timeout context manager for asyncio programs"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -173,6 +179,7 @@ files = [
 name = "attrs"
 version = "23.1.0"
 description = "Classes Without Boilerplate"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -191,6 +198,7 @@ tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pyte
 name = "bcrypt"
 version = "4.0.1"
 description = "Modern password hashing for your software and your servers"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -225,6 +233,7 @@ typecheck = ["mypy"]
 name = "black"
 version = "21.7b0"
 description = "The uncompromising code formatter."
+category = "dev"
 optional = false
 python-versions = ">=3.6.2"
 files = [
@@ -250,6 +259,7 @@ uvloop = ["uvloop (>=0.15.2)"]
 name = "blinker"
 version = "1.4"
 description = "Fast, simple object-to-object and broadcast signaling"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -260,6 +270,7 @@ files = [
 name = "brotli"
 version = "1.0.9"
 description = "Python bindings for the Brotli compression library"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -351,6 +362,7 @@ files = [
 name = "certifi"
 version = "2020.12.5"
 description = "Python package for providing Mozilla's CA Bundle."
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -362,6 +374,7 @@ files = [
 name = "cffi"
 version = "1.16.0"
 description = "Foreign Function Interface for Python calling C code."
+category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -426,6 +439,7 @@ pycparser = "*"
 name = "charset-normalizer"
 version = "3.3.0"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
+category = "main"
 optional = false
 python-versions = ">=3.7.0"
 files = [
@@ -525,6 +539,7 @@ files = [
 name = "click"
 version = "7.1.2"
 description = "Composable command line interface toolkit"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 files = [
@@ -536,6 +551,7 @@ files = [
 name = "colorama"
 version = "0.4.6"
 description = "Cross-platform colored terminal text."
+category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
 files = [
@@ -547,6 +563,7 @@ files = [
 name = "cryptography"
 version = "3.2.1"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
+category = "main"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*"
 files = [
@@ -589,6 +606,7 @@ test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=3.6.0
 name = "distro"
 version = "1.8.0"
 description = "Distro - an OS platform information API"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -600,6 +618,7 @@ files = [
 name = "docker"
 version = "6.1.3"
 description = "A Python library for the Docker Engine API."
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -622,6 +641,7 @@ ssh = ["paramiko (>=2.4.3)"]
 name = "docker-compose"
 version = "1.29.2"
 description = "Multi-container orchestration for Docker"
+category = "main"
 optional = false
 python-versions = ">=3.4"
 files = [
@@ -650,6 +670,7 @@ tests = ["ddt (>=1.2.2,<2)", "pytest (<6)"]
 name = "dockerpty"
 version = "0.4.1"
 description = "Python library to use the pseudo-tty of a docker container"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -663,6 +684,7 @@ six = ">=1.3.0"
 name = "docopt"
 version = "0.6.2"
 description = "Pythonic argument parser, that will make you smile"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -673,6 +695,7 @@ files = [
 name = "dpath"
 version = "2.1.6"
 description = "Filesystem-like pathing and searching for dictionaries"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -684,6 +707,7 @@ files = [
 name = "exceptiongroup"
 version = "1.1.3"
 description = "Backport of PEP 654 (exception groups)"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -698,6 +722,7 @@ test = ["pytest (>=6)"]
 name = "fastcore"
 version = "1.5.29"
 description = "Python supercharged for fastai development"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -716,6 +741,7 @@ dev = ["jupyterlab", "matplotlib", "nbdev (>=0.2.39)", "numpy", "pandas", "pillo
 name = "flask"
 version = "1.1.4"
 description = "A simple framework for building complex web applications."
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 files = [
@@ -738,6 +764,7 @@ dotenv = ["python-dotenv"]
 name = "frozenlist"
 version = "1.4.0"
 description = "A list-like structure which implements collections.abc.MutableSequence"
+category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -808,6 +835,7 @@ files = [
 name = "func-timeout"
 version = "4.3.5"
 description = "Python module which allows you to specify timeouts when calling any existing function. Also provides support for stoppable-threads"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -818,6 +846,7 @@ files = [
 name = "ghapi"
 version = "0.1.23"
 description = "A python client for the GitHub API"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -835,35 +864,41 @@ dev = ["jsonref"]
 
 [[package]]
 name = "goth"
-version = "0.15.8"
+version = "0.15.9"
 description = "Golem Test Harness - integration testing framework"
+category = "main"
 optional = false
-python-versions = ">=3.10.1,<4.0.0"
-files = [
-    {file = "goth-0.15.8-py3-none-any.whl", hash = "sha256:1a0d8b59e207feab8aaf36c6156eab0cf446f56cb6973c71200c531e35a19de9"},
-    {file = "goth-0.15.8.tar.gz", hash = "sha256:16fa44a0a6e4e914064a5bb5cf8d2d0d3af766e97d515a498f66a13723fffd83"},
-]
+python-versions = "^3.10.1"
+files = []
+develop = false
 
 [package.dependencies]
-aiohttp = ">=3.8.5,<4.0.0"
-ansicolors = ">=1.1.0,<2.0.0"
-docker = ">=6.0,<7.0"
-docker-compose = ">=1.29,<2.0"
-dpath = ">=2.0,<3.0"
+aiohttp = "^3.8.5"
+ansicolors = "^1.1.0"
+docker = "^6.0"
+docker-compose = "^1.29"
+dpath = "^2.0"
 func_timeout = "4.3.5"
-ghapi = ">=0.1.16,<0.2.0"
+ghapi = "^0.1.16"
 markupsafe = "2.0.1"
-mitmproxy = ">=5.3,<6.0"
+mitmproxy = "^5.3"
 pyyaml = "5.3.1"
-transitions = ">=0.8,<0.9"
-typing_extensions = ">=4.5,<5.0"
-urllib3 = ">=1.26,<2.0"
-ya-aioclient = ">=0.6,<0.7"
+transitions = "^0.8"
+typing_extensions = "^4.5"
+urllib3 = "^1.26"
+ya-aioclient = "^0.6"
+
+[package.source]
+type = "git"
+url = "https://github.com/golemfactory/goth.git"
+reference = "2c2c8a8b01324350eb5968171fe9e38d333b90f4"
+resolved_reference = "2c2c8a8b01324350eb5968171fe9e38d333b90f4"
 
 [[package]]
 name = "h11"
 version = "0.14.0"
 description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -875,6 +910,7 @@ files = [
 name = "h2"
 version = "4.1.0"
 description = "HTTP/2 State-Machine based protocol implementation"
+category = "main"
 optional = false
 python-versions = ">=3.6.1"
 files = [
@@ -890,6 +926,7 @@ hyperframe = ">=6.0,<7"
 name = "hpack"
 version = "4.0.0"
 description = "Pure-Python HPACK header compression"
+category = "main"
 optional = false
 python-versions = ">=3.6.1"
 files = [
@@ -901,6 +938,7 @@ files = [
 name = "hyperframe"
 version = "6.0.1"
 description = "HTTP/2 framing layer for Python"
+category = "main"
 optional = false
 python-versions = ">=3.6.1"
 files = [
@@ -912,6 +950,7 @@ files = [
 name = "idna"
 version = "3.4"
 description = "Internationalized Domain Names in Applications (IDNA)"
+category = "main"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -923,6 +962,7 @@ files = [
 name = "iniconfig"
 version = "2.0.0"
 description = "brain-dead simple config-ini parsing"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -934,6 +974,7 @@ files = [
 name = "itsdangerous"
 version = "1.1.0"
 description = "Various helpers to pass data to untrusted environments and back."
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 files = [
@@ -945,6 +986,7 @@ files = [
 name = "jinja2"
 version = "2.11.3"
 description = "A very fast and expressive template engine."
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 files = [
@@ -962,6 +1004,7 @@ i18n = ["Babel (>=0.8)"]
 name = "jsonschema"
 version = "3.2.0"
 description = "An implementation of JSON Schema validation for Python"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -983,6 +1026,7 @@ format-nongpl = ["idna", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-va
 name = "kaitaistruct"
 version = "0.9"
 description = "Kaitai Struct declarative parser generator for binary data: runtime library for Python"
+category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
 files = [
@@ -993,6 +1037,7 @@ files = [
 name = "ldap3"
 version = "2.8.1"
 description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1007,6 +1052,7 @@ pyasn1 = ">=0.4.6"
 name = "markupsafe"
 version = "2.0.1"
 description = "Safely add untrusted strings to HTML/XML markup."
+category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -1085,6 +1131,7 @@ files = [
 name = "mitmproxy"
 version = "5.3.0"
 description = "An interactive, SSL/TLS-capable intercepting proxy for HTTP/1, HTTP/2, and WebSockets."
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1126,6 +1173,7 @@ dev = ["Flask (>=1.0,<1.2)", "asynctest (>=0.12.0)", "hypothesis (>=5.8,<6)", "p
 name = "msgpack"
 version = "1.0.7"
 description = "MessagePack serializer"
+category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -1191,6 +1239,7 @@ files = [
 name = "multidict"
 version = "6.0.4"
 description = "multidict implementation"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -1274,6 +1323,7 @@ files = [
 name = "mypy"
 version = "1.5.1"
 description = "Optional static typing for Python"
+category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -1320,6 +1370,7 @@ reports = ["lxml"]
 name = "mypy-extensions"
 version = "1.0.0"
 description = "Type system extensions for programs checked with the mypy type checker."
+category = "dev"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -1331,6 +1382,7 @@ files = [
 name = "packaging"
 version = "23.2"
 description = "Core utilities for Python packages"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -1342,6 +1394,7 @@ files = [
 name = "paramiko"
 version = "2.12.0"
 description = "SSH2 protocol library"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1365,6 +1418,7 @@ invoke = ["invoke (>=1.3)"]
 name = "passlib"
 version = "1.7.4"
 description = "comprehensive password hashing framework supporting over 30 schemes"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1382,6 +1436,7 @@ totp = ["cryptography"]
 name = "pastel"
 version = "0.2.1"
 description = "Bring colors to your terminal."
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 files = [
@@ -1393,6 +1448,7 @@ files = [
 name = "pathspec"
 version = "0.11.2"
 description = "Utility library for gitignore style pattern matching of file paths."
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -1404,6 +1460,7 @@ files = [
 name = "pip"
 version = "23.2.1"
 description = "The PyPA recommended tool for installing Python packages."
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -1415,6 +1472,7 @@ files = [
 name = "pluggy"
 version = "1.3.0"
 description = "plugin and hook calling mechanisms for python"
+category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -1430,6 +1488,7 @@ testing = ["pytest", "pytest-benchmark"]
 name = "poethepoet"
 version = "0.22.1"
 description = "A task runner that works well with poetry."
+category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -1448,6 +1507,7 @@ poetry-plugin = ["poetry (>=1.0,<2.0)"]
 name = "protobuf"
 version = "3.13.0"
 description = "Protocol Buffers"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1479,6 +1539,7 @@ six = ">=1.9"
 name = "publicsuffix2"
 version = "2.20191221"
 description = "Get a public suffix for a domain name using the Public Suffix List. Forked from and using the same API as the publicsuffix package."
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1490,6 +1551,7 @@ files = [
 name = "pyasn1"
 version = "0.4.8"
 description = "ASN.1 types and codecs"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1501,6 +1563,7 @@ files = [
 name = "pycparser"
 version = "2.21"
 description = "C parser in Python"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 files = [
@@ -1512,6 +1575,7 @@ files = [
 name = "pydivert"
 version = "2.1.0"
 description = "Python binding to windivert driver"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1527,6 +1591,7 @@ test = ["codecov (>=2.0.5)", "hypothesis (>=3.5.3)", "mock (>=1.0.1)", "pytest (
 name = "pynacl"
 version = "1.5.0"
 description = "Python binding to the Networking and Cryptography (NaCl) library"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -1553,6 +1618,7 @@ tests = ["hypothesis (>=3.27.0)", "pytest (>=3.2.1,!=3.3.0)"]
 name = "pyopenssl"
 version = "19.1.0"
 description = "Python wrapper module around the OpenSSL library"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1572,6 +1638,7 @@ test = ["flaky", "pretend", "pytest (>=3.0.1)"]
 name = "pyparsing"
 version = "2.4.7"
 description = "Python parsing module"
+category = "main"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 files = [
@@ -1583,6 +1650,7 @@ files = [
 name = "pyperclip"
 version = "1.8.2"
 description = "A cross-platform clipboard module for Python. (Only handles plain text for now.)"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1593,6 +1661,7 @@ files = [
 name = "pyrsistent"
 version = "0.19.3"
 description = "Persistent/Functional/Immutable data structures"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -1629,6 +1698,7 @@ files = [
 name = "pytest"
 version = "7.4.2"
 description = "pytest: simple powerful testing with Python"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -1651,6 +1721,7 @@ testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "no
 name = "pytest-asyncio"
 version = "0.21.0"
 description = "Pytest support for asyncio"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -1669,6 +1740,7 @@ testing = ["coverage (>=6.2)", "flaky (>=3.5.0)", "hypothesis (>=5.7.1)", "mypy
 name = "pytest-split"
 version = "0.8.1"
 description = "Pytest plugin which splits the test suite to equally sized sub suites based on test execution time."
+category = "main"
 optional = false
 python-versions = ">=3.7.1,<4.0"
 files = [
@@ -1683,6 +1755,7 @@ pytest = ">=5,<8"
 name = "python-dateutil"
 version = "2.8.2"
 description = "Extensions to the standard Python datetime module"
+category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
 files = [
@@ -1697,6 +1770,7 @@ six = ">=1.5"
 name = "python-dotenv"
 version = "0.21.1"
 description = "Read key-value pairs from a .env file and set them as environment variables"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -1711,6 +1785,7 @@ cli = ["click (>=5.0)"]
 name = "pywin32"
 version = "306"
 description = "Python for Window Extensions"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1734,6 +1809,7 @@ files = [
 name = "pyyaml"
 version = "5.3.1"
 description = "YAML parser and emitter for Python"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1756,6 +1832,7 @@ files = [
 name = "regex"
 version = "2023.10.3"
 description = "Alternative regular expression module, to replace re."
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -1853,6 +1930,7 @@ files = [
 name = "requests"
 version = "2.31.0"
 description = "Python HTTP for Humans."
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -1874,6 +1952,7 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
 name = "ruamel-yaml"
 version = "0.16.13"
 description = "ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1889,6 +1968,7 @@ jinja2 = ["ruamel.yaml.jinja2 (>=0.2)"]
 name = "setuptools"
 version = "68.2.2"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
+category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -1905,6 +1985,7 @@ testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jar
 name = "six"
 version = "1.16.0"
 description = "Python 2 and 3 compatibility utilities"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 files = [
@@ -1916,6 +1997,7 @@ files = [
 name = "sortedcontainers"
 version = "2.2.2"
 description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1927,6 +2009,7 @@ files = [
 name = "texttable"
 version = "1.7.0"
 description = "module to create simple ASCII tables"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1938,6 +2021,7 @@ files = [
 name = "tomli"
 version = "1.2.3"
 description = "A lil' TOML parser"
+category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -1949,6 +2033,7 @@ files = [
 name = "tornado"
 version = "6.3.3"
 description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed."
+category = "main"
 optional = false
 python-versions = ">= 3.8"
 files = [
@@ -1969,6 +2054,7 @@ files = [
 name = "transitions"
 version = "0.8.11"
 description = "A lightweight, object-oriented Python state machine implementation with many extensions."
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -1987,6 +2073,7 @@ test = ["pytest"]
 name = "typing-extensions"
 version = "4.8.0"
 description = "Backported and Experimental Type Hints for Python 3.8+"
+category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -1998,6 +2085,7 @@ files = [
 name = "urllib3"
 version = "1.26.17"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 files = [
@@ -2014,6 +2102,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 name = "urwid"
 version = "2.1.2"
 description = "A full-featured console (xterm et al.) user interface library"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -2024,6 +2113,7 @@ files = [
 name = "websocket-client"
 version = "0.59.0"
 description = "WebSocket client for Python with low level API options"
+category = "main"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 files = [
@@ -2038,6 +2128,7 @@ six = "*"
 name = "werkzeug"
 version = "1.0.1"
 description = "The comprehensive WSGI web application library."
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 files = [
@@ -2053,6 +2144,7 @@ watchdog = ["watchdog"]
 name = "wsproto"
 version = "0.15.0"
 description = "WebSockets state-machine based protocol implementation"
+category = "main"
 optional = false
 python-versions = ">=3.6.1"
 files = [
@@ -2067,6 +2159,7 @@ h11 = ">=0.8.1"
 name = "ya-aioclient"
 version = "0.6.4"
 description = ""
+category = "main"
 optional = false
 python-versions = ">=3.6,<4.0"
 files = [
@@ -2083,6 +2176,7 @@ python-dateutil = ">=2.8.1,<3.0.0"
 name = "yarl"
 version = "1.9.2"
 description = "Yet another URL library"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -2170,6 +2264,7 @@ multidict = ">=4.0"
 name = "zstandard"
 version = "0.14.1"
 description = "Zstandard bindings for Python"
+category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -2235,4 +2330,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10.1"
-content-hash = "2f2cc4545adb5436924a94e2b87e674b5e345b0cfb8e4287961d80605a9a2cd3"
+content-hash = "7f6d6a57c42e258a855f4ad9dc622726c9f43fbf5138e8f5d371c6cf9f4c0d5a"
diff --git a/goth_tests/pyproject.toml b/goth_tests/pyproject.toml
index e2e909ab46..43c0adec4b 100644
--- a/goth_tests/pyproject.toml
+++ b/goth_tests/pyproject.toml
@@ -8,10 +8,7 @@ version = "0.1.1"
 description = "Integration tests for yagna"
 authors = ["GolemFactory <contact@golem.network>"]
 license = "LGPL-3.0-or-later"
-classifiers = [
-    "Development Status :: 3 - Alpha",
-    "Framework :: AsyncIO",
-]
+classifiers = ["Development Status :: 3 - Alpha", "Framework :: AsyncIO"]
 repository = "https://github.com/golemfactory/yagna"
 documentation = "https://handbook.golem.network"
 readme = "README.md"
@@ -28,9 +25,9 @@ python = "^3.10.1"
 pytest = "^7.4"
 pytest-asyncio = "0.21"
 pytest-split = "^0.8.1"
-goth = "0.15.8"
+# goth = "0.15.8"
 # to use development goth version uncomment below
-# goth =  { git = "https://github.com/golemfactory/goth.git", rev = "7b2c1eca74ebfd1fc6bf25322ad26a0b4b7467c6" }
+goth = { git = "https://github.com/golemfactory/goth.git", rev = "2c2c8a8b01324350eb5968171fe9e38d333b90f4" }
 
 [tool.poetry.dev-dependencies]
 black = "21.7b0"