diff --git a/.env b/.env
index b290898..effd6e6 100644
--- a/.env
+++ b/.env
@@ -1 +1,3 @@
+PUBLIC_DASH_NOTEBOOK_IMAGE_TAG=2024-09-21--39-25
+PUBLIC_DASH_FRONTEND_IMAGE_TAG=2024-09-21--39-25
 SERVER_IMAGE_TAG=2024-09-20--06-45
diff --git a/.env.repoTags b/.env.repoTags
deleted file mode 100644
index 6e67954..0000000
--- a/.env.repoTags
+++ /dev/null
@@ -1 +0,0 @@
-FRONTEND_IMAGE_TAG=2024-09-15--09-41
diff --git a/.github/workflows/image_build_push.yml b/.github/workflows/image_build_push.yml
index b8a2720..6469db6 100644
--- a/.github/workflows/image_build_push.yml
+++ b/.github/workflows/image_build_push.yml
@@ -1,122 +1,32 @@
 name: docker-image-push-public-dash
 
 on:
-  push:
-    branches: [ main ]
+  release:
+    types: [published]
     
   workflow_dispatch:
-    inputs:
-      docker_image_tag:
-        description: "Latest Docker image tags passed from e-mission-server repository on image build and push"
-        required: true
-
-env:
-  DOCKER_USER: ${{secrets.DOCKER_USER}}
-  DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
 
 jobs:
-  build:
+  get-branch-name:
     runs-on: ubuntu-latest
-
-    env:
-      DOCKER_TAG_FROM_WORKFLOW_DISPATCH: ${{ github.event.inputs.docker_image_tag }}
-      
+    outputs:
+      branch_name: ${{ steps.get-branch-name.outputs.branch_name }}
     steps:
-    - uses: actions/checkout@v4
-
-    - name: Set docker image tag from .env file
-      run: |
-        set -a; source .env; set +a
-        echo "Restoring latest server image tag from .env"
-        echo "DOCKER_TAG_FROM_PUSH=${SERVER_IMAGE_TAG}" >> $GITHUB_ENV
-
-    - name: Set docker image tag from .env.repoTags file
-      run: |
-        set -a; source .env.repoTags; set +a
-        echo "Restoring latest frontend image tag from .env.repoTags"
-        echo "FRONTEND_IMAGE_TAG=${FRONTEND_IMAGE_TAG}" >> $GITHUB_ENV
-
-    - name: Print input docker image tag
-      run: |
-        echo "Event name: ${{ github.event_name }}"
-        echo "Latest docker image tag (push): ${{ env.DOCKER_TAG_FROM_PUSH }}"
-        echo "Latest docker image tag (workflow_dispatch): ${{ env.DOCKER_TAG_FROM_WORKFLOW_DISPATCH }}"
-        echo "Current frontend image tag (push): ${{ env.FRONTEND_IMAGE_TAG }}"
-
-    - name: docker login
-      run: | # log into docker hub account
-        docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+      - name: Get branch name based on ref_type
+        id: get-branch-name
+        run: |
+          if [ "${{ github.ref_type }}" == "tag" ]; then
+            target_branch=${{ github.event.release.target_commitish }}
+            echo "branch_name=${target_branch}" >> "$GITHUB_OUTPUT"
+          elif [ "${{ github.ref_type }}" == "branch" ]; then
+            echo "branch_name=${GITHUB_REF##*/}" >> "$GITHUB_OUTPUT"    
+          fi
 
-    - name: Get current date # get the date of the build
-      id: date
-      run: echo "::set-output name=date::$(date +'%Y-%m-%d--%M-%S')"
-
-    - name: Run a one-line script
-      run: echo running in repo ${GITHUB_REPOSITORY#*/} branch ${GITHUB_REF##*/} on ${{ steps.date.outputs.date }}
-
-    - name: build docker image
-      run: |
-        if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
-          SERVER_IMAGE_TAG=$DOCKER_TAG_FROM_WORKFLOW_DISPATCH docker compose -f docker-compose.yml build
-        else
-          SERVER_IMAGE_TAG=$DOCKER_TAG_FROM_PUSH docker compose -f docker-compose.yml build
-        fi
-        docker images
-
-    - name: rename docker images
-      run: |
-        if [ "${{ github.event_name }}" == "push" ]; then
-          docker image tag em-pub-dash-prod/frontend:latest $DOCKER_USER/${GITHUB_REPOSITORY#*/}_frontend:${GITHUB_REF##*/}_${{ steps.date.outputs.date }}
-          echo "FRONTEND_IMAGE_TAG=${{ steps.date.outputs.date }}" >> $GITHUB_ENV
-        fi
-        docker image tag em-pub-dash-prod/viz-scripts:latest $DOCKER_USER/${GITHUB_REPOSITORY#*/}_notebook:${GITHUB_REF##*/}_${{ steps.date.outputs.date }}
-        echo "NOTEBOOK_IMAGE_TAG=${{ steps.date.outputs.date }}" >> $GITHUB_ENV
-
-    - name: push docker images
-      run: |
-        if [ "${{ github.event_name }}" == "push" ]; then
-          docker push $DOCKER_USER/${GITHUB_REPOSITORY#*/}_frontend:${GITHUB_REF##*/}_${{ steps.date.outputs.date }}
-        fi
-        docker push $DOCKER_USER/${GITHUB_REPOSITORY#*/}_notebook:${GITHUB_REF##*/}_${{ steps.date.outputs.date }}
-
-    - name: Update .env file 
-      run: |
-        if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
-          echo "Workflow_dispatch: New server image built and pushed, Updating image tag in .env"
-          echo "SERVER_IMAGE_TAG=$DOCKER_TAG_FROM_WORKFLOW_DISPATCH" > .env
-        else
-          echo "Push event: New frontend image built and pushed, Updating image tag in .env.repoTags"
-          echo "FRONTEND_IMAGE_TAG=${{ steps.date.outputs.date }}" > .env.repoTags
-        fi
-  
-    - name: Add, Commit, Push changes to .env file
-      run: |
-        git config --local user.email "action@github.com"
-        git config --local user.name "Github Actions bot to update .env with latest tags"
-        if git diff --quiet; then
-          echo "Latest timestamps already present in .env files, no changes to commit"
-        else
-          git add .env .env.repoTags
-          git commit -m "Updated docker image tags in .env files to the latest timestamps"
-          git push origin 
-        fi
-   
-    - name: Create tag files
-      run: |
-        echo ${{ env.FRONTEND_IMAGE_TAG }} > frontend_tag_file.txt
-        echo ${{ env.NOTEBOOK_IMAGE_TAG }} > notebook_tag_file.txt
-        echo "Created tag text files"
-
-    - name: Upload Frontend Tag Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: frontend-image-tag
-        path: frontend_tag_file.txt
-        overwrite: true
-  
-    - name: Upload Notebook Tag Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: notebook-image-tag
-        path: notebook_tag_file.txt
-        overwrite: true
+  build:
+    if: ${{ !contains(github.event.release.body, 'Triggered on e-mission-server new release. Bumping up release version.') }}
+    needs: [get-branch-name]
+    uses: e-mission/e-mission-server/.github/workflows/reusable_image_build_push.yml@master
+    with:
+      repo: ${{ github.event.repository.name }}
+      branch: ${{ needs.get-branch-name.outputs.branch_name }}
+    secrets: inherit
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 2992bc5..175cc42 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,4 +1,6 @@
 FROM node:21.7.2-alpine
+LABEL org.opencontainers.image.source=https://github.com/e-mission/em-public-dashboard
+
 VOLUME /public/plots
 
 RUN mkdir -p /public
diff --git a/viz_scripts/Dockerfile b/viz_scripts/Dockerfile
index 52c5aa5..deced2f 100644
--- a/viz_scripts/Dockerfile
+++ b/viz_scripts/Dockerfile
@@ -1,8 +1,7 @@
 # python 3
 ARG SERVER_IMAGE_TAG
-FROM shankari/e-mission-server:master_${SERVER_IMAGE_TAG}
-
-ADD https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem /etc/ssl/certs/
+FROM ghcr.io/e-mission/e-mission-server:${SERVER_IMAGE_TAG}
+LABEL org.opencontainers.image.source=https://github.com/e-mission/em-public-dashboard
 
 VOLUME /plots