diff --git a/docker/regtest/.env.cln1 b/docker/regtest/.env.cln1
index d94d4dc..1dd3052 100644
--- a/docker/regtest/.env.cln1
+++ b/docker/regtest/.env.cln1
@@ -91,12 +91,12 @@ lnd_rest_port=8081
 
 # cln grpc connection data, cert files are in .lightning data folder
 # xxd -p -c2000 client.pem
-cln_grpc_cert="/root/data/clightning-1/regtest/client.pem"
+cln_grpc_cert="/root/data/cln1/regtest/client.pem"
 # xxd -p -c2000 client-key.pem
-cln_grpc_key="/root/data/clightning-1/regtest/client-key.pem"
+cln_grpc_key="/root/data/cln1/regtest/client-key.pem"
 # xxd -p -c2000 ca.pem
-cln_grpc_ca="/root/data/clightning-1/regtest/ca.pem"
-cln_grpc_ip=clightning-1
+cln_grpc_ca="/root/data/cln1/regtest/ca.pem"
+cln_grpc_ip=cln1
 cln_grpc_port=11109
 
 # Tor url of this system. Ignored on platform Raspiblitz.
diff --git a/docker/regtest/.env.cln2 b/docker/regtest/.env.cln2
index b1bf18c..22d4085 100644
--- a/docker/regtest/.env.cln2
+++ b/docker/regtest/.env.cln2
@@ -91,12 +91,12 @@ lnd_rest_port=8081
 
 # cln grpc connection data, cert files are in .lightning data folder
 # xxd -p -c2000 client.pem
-cln_grpc_cert="/root/data/clightning-2/regtest/client.pem"
+cln_grpc_cert="/root/data/cln2/regtest/client.pem"
 # xxd -p -c2000 client-key.pem
-cln_grpc_key="/root/data/clightning-2/regtest/client-key.pem"
+cln_grpc_key="/root/data/cln2/regtest/client-key.pem"
 # xxd -p -c2000 ca.pem
-cln_grpc_ca="/root/data/clightning-2/regtest/ca.pem"
-cln_grpc_ip=clightning-2
+cln_grpc_ca="/root/data/cln2/regtest/ca.pem"
+cln_grpc_ip=cln2
 cln_grpc_port=11109
 
 # Tor url of this system. Ignored on platform Raspiblitz.
diff --git a/docker/regtest/.env.lnd1 b/docker/regtest/.env.lnd1
index dd8a754..da56d12 100644
--- a/docker/regtest/.env.lnd1
+++ b/docker/regtest/.env.lnd1
@@ -81,11 +81,11 @@ bitcoind_pw=lnbits
 # for each implementation.
 ln_node=lnd_grpc
 # LND macaroon in HEX format, or a path to the .macaroon file
-lnd_macaroon="/root/data/lnd-1/data/chain/bitcoin/regtest/admin.macaroon"
+lnd_macaroon="/root/data/lnd1/data/chain/bitcoin/regtest/admin.macaroon"
 # LND certificate in HEX format, or a path to the tls.cert file
-lnd_cert="/root/data/lnd-1/tls.cert"
+lnd_cert="/root/data/lnd1/tls.cert"
 
-lnd_grpc_ip=lnd-1
+lnd_grpc_ip=lnd1
 lnd_grpc_port=10009
 lnd_rest_port=8081
 
diff --git a/docker/regtest/.env.lnd2 b/docker/regtest/.env.lnd2
index 7899dad..3f9a444 100644
--- a/docker/regtest/.env.lnd2
+++ b/docker/regtest/.env.lnd2
@@ -81,11 +81,11 @@ bitcoind_pw=lnbits
 # for each implementation.
 ln_node=lnd_grpc
 # LND macaroon in HEX format, or a path to the .macaroon file
-lnd_macaroon="/root/data/lnd-2/data/chain/bitcoin/regtest/admin.macaroon"
+lnd_macaroon="/root/data/lnd2/data/chain/bitcoin/regtest/admin.macaroon"
 # LND certificate in HEX format, or a path to the tls.cert file
-lnd_cert="/root/data/lnd-2/tls.cert"
+lnd_cert="/root/data/lnd2/tls.cert"
 
-lnd_grpc_ip=lnd-2
+lnd_grpc_ip=lnd2
 lnd_grpc_port=10009
 lnd_rest_port=8081
 
diff --git a/docker/regtest/.env.lnd3 b/docker/regtest/.env.lnd3
index ba3c0b7..116cadc 100644
--- a/docker/regtest/.env.lnd3
+++ b/docker/regtest/.env.lnd3
@@ -81,11 +81,11 @@ bitcoind_pw=lnbits
 # for each implementation.
 ln_node=lnd_grpc
 # LND macaroon in HEX format, or a path to the .macaroon file
-lnd_macaroon="/root/data/lnd-3/data/chain/bitcoin/regtest/admin.macaroon"
+lnd_macaroon="/root/data/lnd3/data/chain/bitcoin/regtest/admin.macaroon"
 # LND certificate in HEX format, or a path to the tls.cert file
-lnd_cert="/root/data/lnd-3/tls.cert"
+lnd_cert="/root/data/lnd3/tls.cert"
 
-lnd_grpc_ip=lnd-2
+lnd_grpc_ip=lnd3
 lnd_grpc_port=10009
 lnd_rest_port=8081
 
diff --git a/docker/regtest/entrypoint.sh b/docker/regtest/entrypoint.sh
index 0ba72b7..ddda66d 100644
--- a/docker/regtest/entrypoint.sh
+++ b/docker/regtest/entrypoint.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 
 
-if [ "$LN_BACKEND" = "cln-1" ]; then
+if [ "$LN_BACKEND" = "cln1" ]; then
   cp /code/.env.cln1 /code/.env
-elif [ "$LN_BACKEND" = "cln-2" ]; then
+elif [ "$LN_BACKEND" = "cln2" ]; then
   cp /code/.env.cln2 /code/.env
-elif [ "$LN_BACKEND" = "lnd-1" ]; then
+elif [ "$LN_BACKEND" = "lnd1" ]; then
   cp /code/.env.lnd1 /code/.env
-elif [ "$LN_BACKEND" = "lnd-2" ]; then
+elif [ "$LN_BACKEND" = "lnd2" ]; then
   cp /code/.env.lnd2 /code/.env
-elif [ "$LN_BACKEND" = "lnd-3" ]; then
+elif [ "$LN_BACKEND" = "lnd3" ]; then
   cp /code/.env.lnd3 /code/.env
 else
   echo "Unknown LN_BACKEND: $LN_BACKEND"