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