diff --git a/.github/workflows/project-automation-issue.yaml b/.github/workflows/project-automation-issue.yaml
index dfa5a39..83b0d32 100644
--- a/.github/workflows/project-automation-issue.yaml
+++ b/.github/workflows/project-automation-issue.yaml
@@ -120,42 +120,31 @@ jobs:
               }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$TYPE_ID" -f opt_id="$OPTION_ID" --silent
           fi
 
-      # - name: Set "Status" field
-      #   env:
-      #     GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}}
-      #   run: |
-      #     MERGED=${{github.event.issue.merged}}
-      #     STATE=${{github.event.issue.state}}
-      #     REVIEWERS=${{github.event.issue.requested_reviewers}}
-      #     DRAFT=${{github.event.issue.draft}}
+      - name: Set "Status" field
+        env:
+          GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}}
+        run: |
+          STATE=${{github.event.issue.state}}
 
-      #     echo "Merged: $MERGED"
-      #     echo "State: $STATE"
-      #     echo "Draft: $DRAFT"
-      #     echo "Reviewer: $REVIEWER"
+          echo "State: $STATE"
 
-      #     OPTION_ID=$STATUS_TODO
+          OPTION_ID=$STATUS_TODO
 
-      #     if [[ ("${MERGED}" == "true") || ("${STATUS}" == "closed") ]]
-      #     then
-      #       OPTION_ID=$STATUS_DONE
-      #     elif [[ ${#REVIEWERS[@]} -gt 0 ]]
-      #     then
-      #       OPTION_ID=$STATUS_READY_FOR_REVIEW
-      #     else
-      #       OPTION_ID=$STATUS_IN_PROGRESS
-      #     fi
+          if [[ "${STATE}" == "closed" ]]
+          then
+            OPTION_ID=$STATUS_DONE
+          fi
 
-      #     gh api graphql -f query='
-      #       mutation ($project: ID!, $item: ID!, $field: ID!, $status_id: ID!) {
-      #         updateProjectNextItemField(input: {
-      #           projectId: $project
-      #           itemId: $item
-      #           fieldId: $field
-      #           value: $status_id
-      #         }) {
-      #           projectNextItem {
-      #             id
-      #           }
-      #         }
-      #       }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$STATUS_ID" -f status_id="$OPTION_ID" --silent
+          gh api graphql -f query='
+            mutation ($project: ID!, $item: ID!, $field: ID!, $status_id: ID!) {
+              updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $field
+                value: $status_id
+              }) {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$STATUS_ID" -f status_id="$OPTION_ID" --silent
diff --git a/.github/workflows/project-automation-pr.yaml b/.github/workflows/project-automation-pr.yaml
index 01ce933..41b026a 100644
--- a/.github/workflows/project-automation-pr.yaml
+++ b/.github/workflows/project-automation-pr.yaml
@@ -138,7 +138,7 @@ jobs:
 
           OPTION_ID=$STATUS_TODO
 
-          if [[ ("${MERGED}" == "true") || ("${STATUS}" == "closed") ]]
+          if [[ ("${MERGED}" == "true") || ("${STATE}" == "closed") ]]
           then
             OPTION_ID=$STATUS_DONE
           elif [[ ${#REVIEWERS[@]} -gt 0 ]]