diff --git a/.github/workflows/action-conventional-commits.yml b/.github/workflows/action-conventional-commits.yml
new file mode 100644
index 0000000..cc3ab9b
--- /dev/null
+++ b/.github/workflows/action-conventional-commits.yml
@@ -0,0 +1,18 @@
+name: Action Conventional Commits
+
+on:
+  push:
+   branches:
+      - main
+
+jobs:
+  build:
+    name: Conventional Commits
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: webiny/action-conventional-commits@v1.3.0
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Optional, for private repositories.
+          allowed-commit-types: "feat,fix" # Optional, set if you want a subset of commit types to be allowed.
\ No newline at end of file
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
deleted file mode 100644
index ff73e92..0000000
--- a/.github/workflows/check.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Pull Request Workflow
-
-on:
-  pull_request:
-    branches:
-      - '*'  # Trigger on all branches for pull requests
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup JAVA
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
-
-      - name: Setup Maven
-        uses: s4u/maven-settings-action@v3.0.0
-
-      - name: Clean
-        run: ./build.sh clean
-        working-directory: ./build
-
-      - name: Test
-        run: ./build.sh commitStage
-        working-directory: ./build
-      
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v4
-        if: always() # always run even if the previous step fails
-        with:
-          report_paths: 'build/target/testReports/*.xml' 
diff --git a/.github/workflows/commit_message.yml b/.github/workflows/commit_message.yml
index 978b961..c28c888 100644
--- a/.github/workflows/commit_message.yml
+++ b/.github/workflows/commit_message.yml
@@ -1,44 +1,23 @@
-name: 'Commit Message Check'
+name: Check Commit Message
+
 on:
-  pull_request:
-    types:
-      - opened
-      - edited
-      - reopened
-      - synchronize
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - reopened
-      - synchronize
   push:
     branches:
       - main
-      - 'releases/*'
 
 jobs:
-  check-commit-message:
-    name: Check Commit Message
+  check_commit_message:
     runs-on: ubuntu-latest
+
     steps:
-      - name: Check Commit Type
-        uses: gsactions/commit-message-checker@v1
-        with:
-          pattern: '\[[^]]+\] .+$'
-          flags: 'gm'
-          error: 'Your first line has to contain a commit type like "[BUGFIX]".'
-      - name: Check Line Length
-        uses: gsactions/commit-message-checker@v1
-        with:
-          pattern: '^[^#].{74}'
-          error: 'The maximum line length of 74 characters is exceeded.'
-          excludeDescription: 'true' # optional: this excludes the description body of a pull request
-          excludeTitle: 'true' # optional: this excludes the title of a pull request
-          checkAllCommitMessages: 'true' # optional: this checks all commits associated with a pull request
-          accessToken: ${{ secrets.GITHUB_TOKEN }} # github access token is only required if checkAllCommitMessages is true
-      - name: Check for Resolves / Fixes
-        uses: gsactions/commit-message-checker@v1
-        with:
-          pattern: '^.+(Resolves|Fixes): \#[0-9]+$'
-          error: 'You need at least one "Resolves|Fixes: #<issue number>" line.'
\ No newline at end of file
+      - name: Checkout code
+        uses: actions/checkout@v2
+      
+      - name: Check commit message
+        run: |
+          COMMIT_MSG=$(git log --format=%B -n 1 ${{ github.sha }})
+          PATTERN='^(feat|fix|docs|style|refactor|perf|test|chore)(\(.+\))?: .{1,100}$'
+          if [[ ! $COMMIT_MSG =~ $PATTERN ]]; then
+            echo "Invalid commit message format. Must match pattern: /^(feat|fix|docs|style|refactor|perf|test|chore)(\(.+\))?: .{1,100}$/"
+            exit 1
+          fi
diff --git a/.github/workflows/gs-commit-message-checker.yml b/.github/workflows/gs-commit-message-checker.yml
new file mode 100644
index 0000000..0b30d85
--- /dev/null
+++ b/.github/workflows/gs-commit-message-checker.yml
@@ -0,0 +1,44 @@
+name: 'GS Commit Message Checker'
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - reopened
+      - synchronize
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - reopened
+      - synchronize
+  push:
+    branches:
+      - main
+      - 'releases/*'
+
+jobs:
+  check-commit-message:
+    name: Check Commit Message
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Commit Type
+        uses: gsactions/commit-message-checker@v1
+        with:
+          pattern: '\[[^]]+\] .+$'
+          flags: 'gm'
+          error: 'Your first line has to contain a commit type like "[BUGFIX]".'
+      - name: Check Line Length
+        uses: gsactions/commit-message-checker@v1
+        with:
+          pattern: '^[^#].{74}'
+          error: 'The maximum line length of 74 characters is exceeded.'
+          excludeDescription: 'true' # optional: this excludes the description body of a pull request
+          excludeTitle: 'true' # optional: this excludes the title of a pull request
+          checkAllCommitMessages: 'true' # optional: this checks all commits associated with a pull request
+          accessToken: ${{ secrets.GITHUB_TOKEN }} # github access token is only required if checkAllCommitMessages is true
+      - name: Check for Resolves / Fixes
+        uses: gsactions/commit-message-checker@v1
+        with:
+          pattern: '^.+(feat|fix|docs|style|refactor|perf|test|chore): \#[0-9]+$'
+          error: 'You need at least one "Resolves|Fixes: #<issue number>" line.'
\ No newline at end of file