diff --git a/.github/workflows/image_build_push.yml b/.github/workflows/image_build_push.yml
index 3033138..bb101fd 100644
--- a/.github/workflows/image_build_push.yml
+++ b/.github/workflows/image_build_push.yml
@@ -62,7 +62,7 @@ jobs:
 
     - name: Update .env file 
       run: |
-        echo "ADMIN_DASH_IMAGE_TAG=${{ steps.date.outputs.date }}" > .env
+        echo "ADMIN_DASH_IMAGE_TAG=${GITHUB_REF##*/}_${{ steps.date.outputs.date }}" > .env
         echo "SERVER_IMAGE_TAG=${{ steps.get-server-tag.outputs.SERVER_IMAGE_TAG }}" >> .env
 
     - name: Add, Commit, Push changes to .env file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8224c25..e589c03 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,6 @@
 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 shankari/e-mission-server:${SERVER_IMAGE_TAG}
 
 ENV DASH_DEBUG_MODE True
 ENV SERVER_PORT 8050