diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c1f506f5c..9b8c1ddb8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -190,6 +190,7 @@ jobs:
       id-token: write
       contents: read
     needs: [build]
+    name: Smoke Test
     runs-on: ubuntu-latest
     env:
       DOCKER_AWS_ENV: -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_SESSION_TOKEN -e AWS_REGION -e AWS_DEFAULT_REGION
@@ -207,7 +208,7 @@ jobs:
 
       - name: (Smoke) Start Local Server
         run: |
-          ./scripts/bmc.sh ./index.cjs serve --config ${CONFIG_PATH} &
+          ./scripts/bms.sh serve --config ${CONFIG_PATH} &
 
           # Wait for the server to start
           timeout 30 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:5000/v1/version)" !=  "200" ]]; do sleep 0.5; done' || false
@@ -216,7 +217,7 @@ jobs:
         run: ./scripts/bmc.sh --test ./node_modules/@basemaps/smoke/build/
 
       - name: (Smoke) Stop Server
-        run: docker stop $(docker ps -a -q)
+        run: docker stop bms
 
   screenshot:
     permissions:
@@ -243,7 +244,7 @@ jobs:
 
       - name: (Screenshot) Screenshot Pull Request Changes
         run: |
-          ./scripts/bmc.sh ./index.cjs serve --config ${CONFIG_PATH} --port 5000 &
+          ./scripts/bms.sh serve --config ${CONFIG_PATH} &
 
           # Wait for the server to start
           timeout 30 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:5000/v1/version)" !=  "200" ]]; do sleep 0.5; done' || false
@@ -257,8 +258,8 @@ jobs:
           snapshot-path: .artifacts/visual-snapshots
 
       - name: (Screenshot) Stop Server
-        run: docker stop $(docker ps -a -q)
-        
+        run: docker stop bms
+
   visual-diff:
     permissions:
       id-token: write
diff --git a/scripts/bmc.sh b/scripts/bmc.sh
index 82dd74bff..cf2e75572 100755
--- a/scripts/bmc.sh
+++ b/scripts/bmc.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 
+. ./version.sh
+
 # Run the basemaps/cli as a docker container with all the extra environment vars and args passed in
 docker run \
   --entrypoint node \
   -v ${PWD}:${PWD} \
-  -p 5000:5000 \
   -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_SESSION_TOKEN -e AWS_REGION -e AWS_DEFAULT_REGION -e BASEMAPS_HOST \
   --rm \
-  ghcr.io/linz/basemaps/cli:v7.3.0-1-gf14d0bab \
+  ghcr.io/linz/basemaps/cli:${BASEMAPS_VERSION} \
   "$@"
\ No newline at end of file
diff --git a/scripts/bms.sh b/scripts/bms.sh
new file mode 100755
index 000000000..b616cd407
--- /dev/null
+++ b/scripts/bms.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+. ./version.sh
+
+# Run the basemaps/cli as a docker container with all the extra environment vars and args passed in
+# Specific for the basemaps server cmd with a port 5000
+docker run \
+  --name bms
+  -v ${PWD}:${PWD} \
+  -p 5000:5000 \
+  -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_SESSION_TOKEN -e AWS_REGION -e AWS_DEFAULT_REGION -e BASEMAPS_HOST \
+  --rm \
+  ghcr.io/linz/basemaps/cli:${BASEMAPS_VERSION} \
+  "$@"
\ No newline at end of file
diff --git a/scripts/version.sh b/scripts/version.sh
new file mode 100644
index 000000000..a24550c9c
--- /dev/null
+++ b/scripts/version.sh
@@ -0,0 +1 @@
+export BASEMAPS_VERSION=v7.3.0-1-gf14d0bab
\ No newline at end of file