diff --git a/README.md b/README.md
index a6b0e2a1b7d..2fb9d1598f4 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,11 @@ export WALLET_PORT=8090
 # set your user id
 export USER_ID=$(id -u)
 
+# set a node socket dir path
+export NODE_SOCKET_DIR=`pwd`/node_socket
+
+# set a node socket name
+export NODE_SOCKET_NAME=node.socket
 
 if [ "$(ls -A "${NODE_DB}")" ]
 then
diff --git a/docker-compose.yml b/docker-compose.yml
index bab7d4c1cd9..95765571102 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,10 +5,10 @@ services:
     image: cardanofoundation/cardano-wallet:${WALLET_TAG}
     environment:
       NETWORK:
-      CARDANO_NODE_SOCKET_PATH: /ipc/node.socket
+      CARDANO_NODE_SOCKET_PATH: /ipc/${NODE_SOCKET_NAME}
     volumes:
       - ${NODE_DB}:/data
-      - node-ipc:/ipc
+      - ${NODE_SOCKET_DIR}:/ipc
       - ./configs/cardano:/configs
     restart: on-failure
     user: ${USER_ID}
@@ -29,7 +29,7 @@ services:
     image: cardanofoundation/cardano-wallet:${WALLET_TAG}
     volumes:
       - ${WALLET_DB}:/wallet-db
-      - node-ipc:/ipc
+      - ${NODE_SOCKET_DIR}:/ipc
       - ./configs/cardano:/configs
     ports:
       - ${WALLET_PORT}:8090
@@ -39,7 +39,7 @@ services:
         ($$CMD --testnet /configs/${NETWORK}/byron-genesis.json)
       "
     environment:
-      CMD: "cardano-wallet serve --node-socket /ipc/node.socket --database /wallet-db --listen-address 0.0.0.0"
+      CMD: "cardano-wallet serve --node-socket /ipc/${NODE_SOCKET_NAME} --database /wallet-db --listen-address 0.0.0.0"
       NETWORK:
     user: ${USER_ID}
     restart: on-failure
diff --git a/scripts/buildkite/release/docker-smoke-test.sh b/scripts/buildkite/release/docker-smoke-test.sh
index 2be05546201..ab05b78d109 100755
--- a/scripts/buildkite/release/docker-smoke-test.sh
+++ b/scripts/buildkite/release/docker-smoke-test.sh
@@ -8,6 +8,7 @@ NETWORK=preprod
 export NETWORK
 
 TESTS_NODE_DB="$(pwd)/state/node_db"
+
 mkdir -p "$TESTS_NODE_DB"
 export TESTS_NODE_DB
 
@@ -32,6 +33,20 @@ export WALLET_PORT
 USER_ID=$(id -u)
 export USER_ID
 
+tmpfile=$(mktemp -d /tmp/node-preprod.XXXXXX)
+
+# set the node socket path
+NODE_SOCKET_DIR="$tmpfile"
+export NODE_SOCKET_DIR
+
+NODE_SOCKET_NAME="node.socket"
+export NODE_SOCKET_NAME
+
+COMPOSE_PROJECT_NAME="docker-smoke-test-$WALLET_PORT"
+export COMPOSE_PROJECT_NAME
+
+docker compose down || true
+
 docker-compose up -d
 
 n=0
@@ -44,14 +59,23 @@ do
             echo "$result" | jq
             break
         else
-            sleep 1
+            sleep 4
             n=$((n+1))
     fi
-    if [ "$n" -ge 20 ]
+    if [ "$n" -ge 30 ]
         then break
     fi
 done
 
+
 mkdir -p logs
 docker-compose logs > logs/docker-compose.log
 docker-compose down
+
+rm -rf "$tmpfile"
+
+if [ "$result" == "wait" ];
+    then
+    echo "Failed to start the wallet server"
+    exit 1
+fi