diff --git a/Dockerfile b/Dockerfile
index 85b7cc9..9e2ca6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y \
     libdb-dev libdb++-dev python3-pip jq git
 
 # Clone and build Bitcoin Core
-RUN git clone --depth 1 https://github.com/bitcoin/bitcoin.git 
+RUN git clone https://github.com/bitcoin/bitcoin.git 
 
 # Build Bitcoin core
 WORKDIR /bitcoin
diff --git a/bitcoin.conf b/bitcoin.conf
index c5b030c..5b0f43d 100644
--- a/bitcoin.conf
+++ b/bitcoin.conf
@@ -3,8 +3,8 @@ signet=1
 daemon=1
 
 # Custom Signet challenge
-# This was generated by running the signet challenge script.
-signetchallenge= 512102a353dc1b52018dce23d364bb007608a2849caef3f11fe655c9c5d439656d669851ae
+# This is generated by running the signet challenge script.
+signetchallenge=512102a353dc1b52018dce23d364bb007608a2849caef3f11fe655c9c5d439656d669851ae
 
 
 #rpcauth=would be provided when needed
diff --git a/generate_signet.sh b/generate_signet.sh
index 3c7438b..b995ba9 100755
--- a/generate_signet.sh
+++ b/generate_signet.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Start Bitcoind in Signet mode
-/usr/local/bin/bitcoind -signet -daemon -wallet="test" #change wallet name
+/usr/local/bin/bitcoind -signet -daemon 
 echo "wating for signet bitcoind to start..."
 while ! /usr/local/bin/bitcoin-cli -signet getconnectioncount 2>/dev/null 1>&2; do
     echo -n ".";
@@ -9,10 +9,22 @@ while ! /usr/local/bin/bitcoin-cli -signet getconnectioncount 2>/dev/null 1>&2;
 done
 echo "started"
 
+# check if custom_signet_wallet exist, create it if not
+if ! /usr/local/bin/bitcoin-cli -signet listwallets | grep -q "custom_signet_wallet"; then
+    echo "Creating wallet: custom_signet_wallet"
+    /usr/local/bin/bitcoin-cli -signet createwallet "custom_signet_wallet"
+  else 
+     echo "Wallet custom_signet-wallet already exists"
+  fi
+
 # Generate mew address and keys
-ADDR=$(/usr/local/bin/bitcoin-cli -signet getnewaddress '' bech32)
-PRIVKEY=$(/usr/local/bin/bitcoin-cli -signet dumpprivkey $ADDR)
-PUBKEY=$(/usr/local/bin/bitcoin-cli -signet getaddressinfo $ADDR | jq -r .pubKey)
+ADDR=$(/usr/local/bin/bitcoin-cli -signet -rpcwallet="custom_signet_wallet" getnewaddress '' bech32)
+if [ -z "$ADDR" ]; then
+    echo "Failed to get new address"
+fi
+
+PRIVKEY=$(/usr/local/bin/bitcoin-cli -signet -rpcwallet="custom_signet_wallet" dumpprivkey $ADDR)
+PUBKEY=$(/usr/local/bin/bitcoin-cli -signet -rpcwallet="custom_signet_wallet" getaddressinfo $ADDR | jq -r .pubkey)
 
 # Calculate script length and keys
 LENX2=$(printf $PUBKEY | wc -c)
@@ -88,3 +100,6 @@ $CLI -signet getblocktemplate '{"rules": ["signet","segwit"]}' \
 # Stop the custom Signet node
 ./bitcoin-cli -datadir=$datadir stop
 
+
+
+# -wallet="custom_signet_wallet" #Wallet name must match the name we have in signet_challenge script
\ No newline at end of file