diff --git a/.github/workflows/image-push.yml b/.github/workflows/image-push.yml
index ff226e3d..60ce3883 100644
--- a/.github/workflows/image-push.yml
+++ b/.github/workflows/image-push.yml
@@ -49,7 +49,8 @@ jobs:
             APP_VERSION=${{ steps.get_version.outputs.VERSION }}
             APP_GS_DATA_URL=${{ secrets.GS_DATA_URL }}
             APP_UI_DATA_URL=${{ secrets.UI_DATA_URL }}
-            APP_UI_DATA_TOKEN=${{ secrets.TOKEN }}
+            APP_UI_DATA_TOKEN=${{ secrets.UI_DATA_TOKEN }}
+            APP_UI_MAPBOX_TOKEN=${{ secrets.UI_MAPBOX_TOKEN }}
 
           tags: |
             ${{ env.REGISTRY }}:latest
diff --git a/Dockerfile b/Dockerfile
index f30c2b78..2c9d1ce2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,16 +25,19 @@ ARG APP_VERSION=$(APP_VERSION)
 ARG APP_GS_DATA_URL=$(APP_GS_DATA_URL)
 ARG APP_UI_DATA_URL=$(APP_UI_DATA_URL)
 ARG APP_UI_DATA_TOKEN=$(APP_UI_DATA_TOKEN)
+ARG APP_UI_MAPBOX_TOKEN=$(APP_UI_MAPBOX_TOKEN)
 
 # now add the values into ENV params
 ENV REACT_APP_VERSION=$APP_VERSION
 ENV REACT_APP_GS_DATA_URL=$APP_GS_DATA_URL
 ENV REACT_APP_UI_DATA_URL=$APP_UI_DATA_URL
 ENV REACT_APP_UI_DATA_TOKEN=$APP_UI_DATA_TOKEN
+ENV REACT_APP_MAPBOX_TOKEN=$APP_UI_MAPBOX_TOKEN
 
 # create the env file
 RUN printf "NODE_ENV=production\nREACT_APP_VERSION=$APP_VERSION\nREACT_APP_GS_DATA_URL=$APP_GS_DATA_URL\n" > .env
 RUN printf "REACT_APP_UI_DATA_URL=$APP_UI_DATA_URL\nREACT_APP_UI_DATA_TOKEN=$APP_UI_DATA_TOKEN\n" >> .env
+RUN printf "REACT_APP_MAPBOX_TOKEN=$REACT_APP_MAPBOX_TOKEN\n" >> .env
 
 # Copy in source files
 COPY . /src
diff --git a/src/components/map/default-layers.js b/src/components/map/default-layers.js
index 6f855965..6f8d81f0 100644
--- a/src/components/map/default-layers.js
+++ b/src/components/map/default-layers.js
@@ -84,7 +84,7 @@ export const DefaultLayers = () => {
       markClicked(map, e);
 
       // populate selectedObservations list with the newly selected observation point
-      setSelectedObservations(previous => [...previous, feature.properties]);
+      //setSelectedObservations(previous => [...previous, feature.properties]);
       });
     }
   };
diff --git a/src/components/map/map.js b/src/components/map/map.js
index 1bec5aca..8a39e91d 100644
--- a/src/components/map/map.js
+++ b/src/components/map/map.js
@@ -24,8 +24,8 @@ export const Map = () => {
         whenCreated={setMap}
         style={{ height: '100vh', width:'100wh' }}>
           { darkMode.enabled
-            ? <TileLayer url={ `https://api.mapbox.com/styles/v1/mvvatson/clvu3inqs05v901qlabcfhxsr/tiles/256/{z}/{x}/{y}@2x?access_token=${ process.env.MAPBOX_TOKEN }` } />
-            : <TileLayer url={ `https://api.mapbox.com/styles/v1/mvvatson/clvu2u7iu061901ph15n55v2e/tiles/256/{z}/{x}/{y}@2x?access_token=${ process.env.MAPBOX_TOKEN }` } />
+            ? <TileLayer url={ `https://api.mapbox.com/styles/v1/mvvatson/clvu3inqs05v901qlabcfhxsr/tiles/256/{z}/{x}/{y}@2x?access_token=${ process.env.REACT_APP_MAPBOX_TOKEN }` } />
+            : <TileLayer url={ `https://api.mapbox.com/styles/v1/mvvatson/clvu2u7iu061901ph15n55v2e/tiles/256/{z}/{x}/{y}@2x?access_token=${ process.env.REACT_APP_MAPBOX_TOKEN }` } />
           }
           <DefaultLayers/>
       </MapContainer>