diff --git a/.github/main.workflow b/.github/main.workflow
deleted file mode 100644
index d23b686..0000000
--- a/.github/main.workflow
+++ /dev/null
@@ -1,22 +0,0 @@
-workflow "Sync issues to JIRA" {
-  on = "issues"
-  resolves = ["Sync to JIRA"]
-}
-
-workflow "Sync issue and PR comments to JIRA" {
-  on = "issue_comment"
-  resolves = ["Sync to JIRA"]
-}
-
-workflow "Sync PRs to JIRA" {
-  on = "pull_request"
-  resolves = ["Sync to JIRA"]
-}
-
-action "Sync to JIRA" {
-  uses = "espressif/github-actions/sync_issues_to_jira@master"
-  secrets = ["GITHUB_TOKEN", "JIRA_URL", "JIRA_USER", "JIRA_PASS"]
-  env = {
-    JIRA_PROJECT = "IDFGH"
-  }
-}
diff --git a/.github/workflows/issue_comment.yml b/.github/workflows/issue_comment.yml
new file mode 100644
index 0000000..6c7d9ef
--- /dev/null
+++ b/.github/workflows/issue_comment.yml
@@ -0,0 +1,20 @@
+name: Sync issue comments to JIRA
+
+# This workflow will be triggered when new issue comment is created (including PR comments)
+on: issue_comment
+
+jobs:
+  sync_issue_comments_to_jira:
+    name: Sync Issue Comments to Jira
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Sync issue comments to JIRA
+        uses: espressif/github-actions/sync_issues_to_jira@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JIRA_PASS: ${{ secrets.JIRA_PASS }}
+          JIRA_PROJECT: IDFGH
+          JIRA_COMPONENT: esp-mqtt
+          JIRA_URL: ${{ secrets.JIRA_URL }}
+          JIRA_USER: ${{ secrets.JIRA_USER }}
diff --git a/.github/workflows/new_issues.yml b/.github/workflows/new_issues.yml
new file mode 100644
index 0000000..0fc5e7c
--- /dev/null
+++ b/.github/workflows/new_issues.yml
@@ -0,0 +1,20 @@
+name: Sync issues to Jira
+
+# This workflow will be triggered when a new issue is opened
+on: issues
+
+jobs:
+  sync_issues_to_jira:
+    name: Sync issues to Jira
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Sync GitHub issues to Jira project
+        uses: espressif/github-actions/sync_issues_to_jira@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JIRA_PASS: ${{ secrets.JIRA_PASS }}
+          JIRA_PROJECT: IDFGH
+          JIRA_COMPONENT: esp-mqtt
+          JIRA_URL: ${{ secrets.JIRA_URL }}
+          JIRA_USER: ${{ secrets.JIRA_USER }}
diff --git a/.github/workflows/new_prs.yml b/.github/workflows/new_prs.yml
new file mode 100644
index 0000000..630c373
--- /dev/null
+++ b/.github/workflows/new_prs.yml
@@ -0,0 +1,20 @@
+name: Sync PRs to JIRA
+
+# This workflow will be triggered when a pull request is opened
+on: pull_request
+
+jobs:
+  sync_prs_to_jira:
+    name: Sync PRs to Jira
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Sync PRs to Jira project
+        uses: espressif/github-actions/sync_issues_to_jira@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JIRA_PASS: ${{ secrets.JIRA_PASS }}
+          JIRA_PROJECT: IDFGH
+          JIRA_COMPONENT: esp-mqtt
+          JIRA_URL: ${{ secrets.JIRA_URL }}
+          JIRA_USER: ${{ secrets.JIRA_USER }}