diff --git a/.github/workflows/terraform.yaml b/.github/workflows/terraform.yaml
index fc34f34..e2b49e8 100644
--- a/.github/workflows/terraform.yaml
+++ b/.github/workflows/terraform.yaml
@@ -2,7 +2,8 @@ name: terraform
 
 on:
   - pull_request
-
+env:
+  working_directory: ./test
 jobs:
   terraform:
     runs-on: ubuntu-latest
@@ -29,10 +30,13 @@ jobs:
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         script: |
-          const output = `#### Terraform Format and Style 🖌\`${{ steps.fmt.outcome }}\`
-          #### Terraform Initialization ⚙️\`${{ steps.init.outcome }}\`
-          #### Terraform Validation 🤖${{ steps.validate.outputs.stdout }}
-          #### Terraform Plan 📖\`${{ steps.plan.outcome }}\`
+          const tfInitStatus = ${{steps.init.outputs.exitcode == 0}} ? ':x:' : ':white_check_mark:'
+          const tfValidationStatus = ${{steps.validate.outputs.exitcode == 0}} ? ':x:' : ':white_check_mark:'
+          const tfPlanStatus = ${{steps.plan.outputs.exitcode == 0}} ? ':x:' : ':white_check_mark:'
+
+          const output = `${tfInitStatus} Terraform Initialization
+          ${tfValidationStatus} Terraform Validation
+          ${tfPlanStatus} Terraform Plan
 
           <details><summary>Show Plan</summary>
 
@@ -40,11 +44,14 @@ jobs:
 
           </details>
 
-          *Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`, Working Directory: \`${{ env.tf_actions_working_dir }}\`, Workflow: \`${{ github.workflow }}\`*`;
+          *User*: @${{ github.actor }}
+          *Action*: \`${{ github.event_name }}\`
+          *Working Directory*: \`${{ env.working_directory }}\`
+          *Workflow*: \`${{ github.workflow }}\``;
 
           github.issues.createComment({
             issue_number: context.issue.number,
             owner: context.repo.owner,
             repo: context.repo.repo,
             body: output
-          })
\ No newline at end of file
+          })