diff --git a/.circleci/config.yml b/.circleci/config.yml
index b11d3db..d41351e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -56,6 +56,13 @@ jobs:
           command: |
             ./gradlew bootJar
             docker build -t openmf/ph-ee-notifications:latest .
+            if [ "$CIRCLE_BRANCH" != "master" ]; then
+              PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST)
+              PR_TITLE=$(curl -sSL "https://api.github.com/repos/openmf/$CIRCLE_PR_REPONAME/pulls/$PR_NUMBER" | jq -r '.title')
+              JIRA_STORY=$(echo $PR_TITLE | cut -d "[" -f2 | cut -d "]" -f1 | tr '[A-Z]' '[a-z]')
+              if [ -z "$JIRA_STORY" ]; then echo "Invalid PR title" && exit 1; else echo "Ticket NO: $JIRA_STORY"; fi
+              docker image tag openmf/$CIRCLE_PR_REPONAME:latest openmf/$CIRCLE_PR_REPONAME:$JIRA_STORY
+            fi
 
       # Log in to DockerHub using environment variables
       - run:
@@ -65,7 +72,16 @@ jobs:
       # Push the Docker image to DockerHub
       - run:
           name: Push Docker image to DockerHub
-          command: docker push openmf/ph-ee-notifications:latest        
+          command: |
+            if [ "$CIRCLE_BRANCH" = "master" ]; then
+            docker push openmf/ph-ee-notifications:latest
+            fi
+            if [ "$CIRCLE_BRANCH" != "master" ]; then
+            PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST)
+            PR_TITLE=$(curl -sSL "https://api.github.com/repos/openmf/$CIRCLE_PR_REPONAME/pulls/$PR_NUMBER" | jq -r '.title')
+            JIRA_STORY=$(echo $PR_TITLE | cut -d "[" -f2 | cut -d "]" -f1 | tr '[A-Z]' '[a-z]')
+            docker push openmf/$CIRCLE_PR_REPONAME:${JIRA_STORY}
+            fi
 
 workflows:
   version: 2
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 98c407d..9110b69 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,13 +1,15 @@
 ## Description
 
+* PR title should have jira ticket enclosed in `[]`.<br>
+  Format: ``` [jira_ticket] description```<br>
+  ex: [phee-123] PR title.
+* Add a link to the Jira ticket.
 * Describe the changes made and why they were made.
-* Add a link to teh design document or include the design bullet points related to this PR here.
-
- _(Ignore if these details are present on the associated JIRA ticket)_
 
 ## Checklist
 
 Please make sure these boxes are checked before submitting your pull request - thanks!
+- [ ] Followed the PR title naming convention mentioned above.
 
 - [ ] Design related bullet points or design document link related to this PR added in the description above.