diff --git a/BTCPayServer.Tests/docker-bitcoin-cli.ps1 b/BTCPayServer.Tests/docker-bitcoin-cli.ps1
index 163f64a83..6cd66ec64 100644
--- a/BTCPayServer.Tests/docker-bitcoin-cli.ps1
+++ b/BTCPayServer.Tests/docker-bitcoin-cli.ps1
@@ -1 +1,2 @@
-docker exec -ti btcpayservertests_bitcoind_1 bitcoin-cli -datadir="/data" $args
+$bitcoind_container_id=$(docker ps -q --filter label=com.docker.compose.project=btcpayservertests --filter label=com.docker.compose.service=bitcoind)
+docker exec -ti $bitcoind_container_id bitcoin-cli -datadir="/data" $args
diff --git a/BTCPayServer.Tests/docker-bitcoin-cli.sh b/BTCPayServer.Tests/docker-bitcoin-cli.sh
index 9d7a9215d..45ae1c8ce 100755
--- a/BTCPayServer.Tests/docker-bitcoin-cli.sh
+++ b/BTCPayServer.Tests/docker-bitcoin-cli.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-docker exec -ti btcpayservertests_bitcoind_1 bitcoin-cli -datadir="/data" "$@"
+bitcoind_container_id="$(docker ps -q --filter label=com.docker.compose.project=btcpayservertests --filter label=com.docker.compose.service=bitcoind)"
+docker exec -ti "$bitcoind_container_id" bitcoin-cli -datadir="/data" "$@"
diff --git a/BTCPayServer.Tests/docker-customer-lightning-cli.ps1 b/BTCPayServer.Tests/docker-customer-lightning-cli.ps1
index 64209bfe0..170b13938 100644
--- a/BTCPayServer.Tests/docker-customer-lightning-cli.ps1
+++ b/BTCPayServer.Tests/docker-customer-lightning-cli.ps1
@@ -1 +1,2 @@
-docker exec -ti btcpayservertests_customer_lightningd_1 lightning-cli $args
+$customer_lightning_container_id=$(docker ps -q --filter label=com.docker.compose.project=btcpayservertests --filter label=com.docker.compose.service=customer_lightningd)
+docker exec -ti $customer_lightning_container_id lightning-cli $args
diff --git a/BTCPayServer.Tests/docker-customer-lightning-cli.sh b/BTCPayServer.Tests/docker-customer-lightning-cli.sh
index d2893ea77..abe3611bc 100755
--- a/BTCPayServer.Tests/docker-customer-lightning-cli.sh
+++ b/BTCPayServer.Tests/docker-customer-lightning-cli.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-docker exec -ti btcpayservertests_customer_lightningd_1 lightning-cli "$@"
+customer_lightning_container_id="$(docker ps -q --filter label=com.docker.compose.project=btcpayservertests --filter label=com.docker.compose.service=customer_lightningd)"
+docker exec -ti $customer_lightning_container_id lightning-cli "$@"
diff --git a/BTCPayServer.Tests/docker-litecoin-cli.ps1 b/BTCPayServer.Tests/docker-litecoin-cli.ps1
index f79d6b58a..ab080b002 100644
--- a/BTCPayServer.Tests/docker-litecoin-cli.ps1
+++ b/BTCPayServer.Tests/docker-litecoin-cli.ps1
@@ -1 +1,2 @@
-docker exec -ti btcpayservertests_litecoind_1 litecoin-cli -datadir="/data" $args
+$litecoind_container_id=$(docker ps -q --filter label=com.docker.compose.project=btcpayservertests --filter label=com.docker.compose.service=litecoind)
+docker exec -ti $litecoind_container_id litecoin-cli -datadir="/data" $args
diff --git a/BTCPayServer.Tests/docker-litecoin-cli.sh b/BTCPayServer.Tests/docker-litecoin-cli.sh
index 584bbf22e..599f4d6f2 100755
--- a/BTCPayServer.Tests/docker-litecoin-cli.sh
+++ b/BTCPayServer.Tests/docker-litecoin-cli.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-docker exec -ti btcpayservertests_litecoind_1 litecoin-cli -datadir="/data" "$@"
+litecoind_container_id="$(docker ps -q --filter label=com.docker.compose.project=btcpayservertests --filter label=com.docker.compose.service=litecoind)"
+docker exec -ti "$litecoind_container_id" litecoin-cli -datadir="/data" "$@"
diff --git a/BTCPayServer.Tests/docker-merchant-lightning-cli.ps1 b/BTCPayServer.Tests/docker-merchant-lightning-cli.ps1
index 576cf31d0..772db5eaf 100755
--- a/BTCPayServer.Tests/docker-merchant-lightning-cli.ps1
+++ b/BTCPayServer.Tests/docker-merchant-lightning-cli.ps1
@@ -1 +1,2 @@
-docker exec -ti btcpayservertests_merchant_lightningd_1 lightning-cli $args
+$merchant_lightning_container_id=$(docker ps -q --filter label=com.docker.compose.project=btcpayservertests --filter label=com.docker.compose.service=merchant_lightningd)
+docker exec -ti $merchant_lightning_container_id lightning-cli $args
diff --git a/BTCPayServer.Tests/docker-merchant-lightning-cli.sh b/BTCPayServer.Tests/docker-merchant-lightning-cli.sh
index 56dbdf91d..f73029bf9 100755
--- a/BTCPayServer.Tests/docker-merchant-lightning-cli.sh
+++ b/BTCPayServer.Tests/docker-merchant-lightning-cli.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-docker exec -ti btcpayservertests_merchant_lightningd_1 lightning-cli "$@"
+merchant_lightning_container_id="$(docker ps -q --filter label=com.docker.compose.project=btcpayservertests --filter label=com.docker.compose.service=merchant_lightningd)"
+docker exec -ti $merchant_lightning_container_id lightning-cli "$@"