diff --git a/.github/workflows/slack.yml b/.github/workflows/slack.yml
index a5405a4..5df3642 100644
--- a/.github/workflows/slack.yml
+++ b/.github/workflows/slack.yml
@@ -1,16 +1,39 @@
-name: Slack Notify on Star
-on: watch
+name: Slack Notify
+on:
+  watch:
+    types:
+      - started
 jobs:
   star-notify:
+    if: github.event_name == 'watch'
     name: Notify Slack on star
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-    - name: Get current star count
-      run: |
-        echo ::set-env name=STARS::$(curl --silent 'https://api.github.com/repos/layer5io/advanced-istio-service-mesh-workshop' -H 'Accept: application/vnd.github.preview' | jq '.watchers_count')
-    - name: Notify slack
-      env:
-        SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
-      uses: pullreminders/slack-action@master
-      with:
-        args: '{\"channel\":\"CSK7N9TGX\",\"text\":\"Someone just starred Advanced Istio Service Mesh Workshop! (https://github.com/layer5io/advanced-istio-service-mesh-workshop/stargazers) Total ⭐️: ${{env.STARS}}\"}'
+      - name: Get current star count
+        run: >
+          echo "STARS=$(curl --silent
+          'https://api.github.com/repos/${{github.repository}}' -H 'Accept:
+          application/vnd.github.preview' | jq '.stargazers_count')" >>
+          $GITHUB_ENV
+      - name: Notify slack
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+        uses: pullreminders/slack-action@master
+        with:
+          args: '{\"channel\":\"CSK7N9TGX\",\"text\":\"${{ github.actor }} just starred
+            ${{github.repository}}!
+            (https://github.com/${{github.repository}}/stargazers) Total ⭐️:
+            ${{env.STARS}}\"}'
+  good-first-issue-notify:
+    if: github.event_name == 'issues' && github.event.label.name == 'good first
+      issue' || github.event.label.name == 'first-timers-only'
+    name: Notify Slack for new good-first-issue
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Notify slack
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+        uses: pullreminders/slack-action@master
+        with:
+          args: '{\"channel\":\"C019426UBNY\",\"text\":\"A good first issue label was just
+            added to ${{github.event.issue.html_url}}.\"}'
\ No newline at end of file