diff --git a/.buildkite/bench-restore.sh b/.buildkite/bench-restore.sh
index 8400d5d80c2..1b3ecae8717 100755
--- a/.buildkite/bench-restore.sh
+++ b/.buildkite/bench-restore.sh
@@ -3,27 +3,26 @@
 
 set -euo pipefail
 
-if [ "$#" -lt 2 ]; then
-  echo "usage: $0 TARGET NETWORK"
+if [ "$#" -lt 1 ]; then
+  echo "usage: $0 NETWORK"
   exit 1
 fi
 
-target=$1
-network=$2
-artifact_name=restore-$target-$network
+network=$1
+artifact_name=restore-$network
 log=restore.log
-results=restore-$target-$network.txt
+results=restore-$network.txt
 total_time=restore-time.txt
 
-: "${NODE_DB:=$HOME/node-db-$target-$network}"
+: "${NODE_DB:=$HOME/node-db-$network}"
 
 echo "--- Build"
 
-nix-build -A benchmarks.cardano-wallet-$target.restore -o bench-$target-restore
+nix-build -A benchmarks.cardano-wallet.restore -o bench-restore
 
-bench="./bench-$target-restore/bin/restore $network"
+bench="./bench-restore/bin/restore $network"
 
-echo "--- Run benchmarks - $target - $network"
+echo "--- Run benchmarks - $network"
 
 if [ -n "${SCRATCH_DIR:-}" ]; then
   mkdir -p "$SCRATCH_DIR"
@@ -34,7 +33,7 @@ command time -o $total_time -v $bench +RTS -N2 -qg -A1m -I0 -T -M8G -h -RTS 2>&1
 
 grep -v INFO $log | awk '/All results/,EOF { print $0 }' > $results
 
-echo "+++ Results - $target - $network"
+echo "+++ Results - $network"
 
 cat $results
 
@@ -53,7 +52,7 @@ show ylabel;
 
 set terminal svg dynamic size 1200,700 background rgb 'white';
 set output "plot.svg";
-set title "Restoring $target wallets on $network";
+set title "Restoring wallets on $network";
 
 set key left top;
 
diff --git a/.buildkite/nightly.yml b/.buildkite/nightly.yml
index 210f6054ff0..1930bcc2330 100644
--- a/.buildkite/nightly.yml
+++ b/.buildkite/nightly.yml
@@ -7,7 +7,7 @@ env:
 
 steps:
   - label: 'Restore benchmark - cardano mainnet'
-    command: "./.buildkite/bench-restore.sh shelley mainnet"
+    command: "./.buildkite/bench-restore.sh mainnet"
     env:
       HOME: "/cache/cardano-wallet.home"
     timeout_in_minutes: 600
@@ -16,7 +16,7 @@ steps:
       queue: benchmark
 
   - label: 'Restore benchmark - cardano testnet'
-    command: "./.buildkite/bench-restore.sh shelley testnet"
+    command: "./.buildkite/bench-restore.sh testnet"
     env:
       HOME: "/cache/cardano-wallet.home"
     timeout_in_minutes: 600
diff --git a/.github/RELEASE_TEMPLATE.md b/.github/RELEASE_TEMPLATE.md
index 8d659657f20..0a1f8cff05f 100644
--- a/.github/RELEASE_TEMPLATE.md
+++ b/.github/RELEASE_TEMPLATE.md
@@ -45,8 +45,8 @@ the moment of releasing. -->
 Pull from DockerHub and verify the version matches {{CABAL_VERSION}}.
 
 ```
-$ docker pull inputoutput/cardano-wallet:{{CABAL_VERSION}}-shelley
-$ docker run --rm inputoutput/cardano-wallet:{{CABAL_VERSION}}-shelley version
+$ docker pull inputoutput/cardano-wallet:{{CABAL_VERSION}}
+$ docker run --rm inputoutput/cardano-wallet:{{CABAL_VERSION}} version
 ```
 
 ### ITN (jormungandr)
diff --git a/nix/docker.nix b/nix/docker.nix
index c3f167873a5..fd59caf4aa6 100644
--- a/nix/docker.nix
+++ b/nix/docker.nix
@@ -27,7 +27,9 @@ let
   defaultPort = "8090";
   dataDir = "/data";
 
-  startScript = writeScriptBin "start-cardano-wallet-${backend}" ''
+  suffix = if backend == "shelley" then "" else "-" + backend;
+  walletExeName = "cardano-wallet" + suffix;
+  startScript = writeScriptBin "start-wallet" ''
     #!${runtimeShell}
     set -euo pipefail
 
@@ -37,7 +39,7 @@ let
     ln -s ${dataDir} /cardano-wallet
 
     export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
-    exec ${exe}/bin/cardano-wallet-${backend} "$@"
+    exec ${exe}/bin/${walletExeName} "$@"
   '';
 
   # Config file needed for container/host resolution.
@@ -68,7 +70,7 @@ in
       startScript
     ];
     config = {
-      EntryPoint = [ "start-cardano-wallet-${backend}" ];
+      EntryPoint = [ "start-wallet" ];
       ExposedPorts = {
         "${defaultPort}/tcp" = {}; # wallet api
       };