diff --git a/.github/workflows/auth-service-cd.yml b/.github/workflows/auth-service-cd.yml
index 5ad23ae..9b5a827 100644
--- a/.github/workflows/auth-service-cd.yml
+++ b/.github/workflows/auth-service-cd.yml
@@ -16,9 +16,9 @@ jobs:
           id: create_image_tag
           with:
             script: |
-              if (context.issue.number) {
+              if(github.ref == 'refs/heads/main') {
                 return "pr" + context.issue.number;
-              } else if(github.ref == 'refs/heads/main') {
+              } else if(context.issue.number) {
                 return 'latest';
               } else {
                 return "pr" + (
diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml
index 0245867..f3ebd9f 100644
--- a/.github/workflows/backend-cd.yml
+++ b/.github/workflows/backend-cd.yml
@@ -16,9 +16,9 @@ jobs:
           id: create_image_tag
           with:
             script: |
-              if (context.issue.number) {
+              if(github.ref == 'refs/heads/main') {
                 return "pr" + context.issue.number;
-              } else if(github.ref == 'refs/heads/main') {
+              } else if(context.issue.number) {
                 return 'latest';
               } else {
                 return "pr" + (