diff --git a/.github/workflows/conventional-commits-check.yaml b/.github/workflows/conventional-commits-check.yaml
new file mode 100644
index 000000000..37581aec1
--- /dev/null
+++ b/.github/workflows/conventional-commits-check.yaml
@@ -0,0 +1,15 @@
+name: Conventional Commits Check
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  check-conventional-commits:
+    name: Conventional Commits
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check Commit Conventions
+        uses: webiny/action-conventional-commits@v1.3.0
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/push.yml
similarity index 97%
rename from .github/workflows/release.yml
rename to .github/workflows/push.yml
index cb1c579ff..a336698fb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/push.yml
@@ -1,4 +1,4 @@
-name: release
+name: Release on tag
 on:
   push:
     tags:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
new file mode 100644
index 000000000..754d6bd4e
--- /dev/null
+++ b/.github/workflows/release.yaml
@@ -0,0 +1,20 @@
+name: Release Please
+
+on:
+  push:
+    branches:
+      - develop
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Release Please Action
+        uses: googleapis/release-please-action@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          config-file: release-please-config.json
\ No newline at end of file
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
new file mode 100644
index 000000000..e65b5edda
--- /dev/null
+++ b/.release-please-manifest.json
@@ -0,0 +1,3 @@
+{
+  ".": "v1.9.5"
+}
\ No newline at end of file
diff --git a/release-please-config.json b/release-please-config.json
new file mode 100644
index 000000000..aa3c1c1f0
--- /dev/null
+++ b/release-please-config.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
+  "include-v-in-tag": true
+}
\ No newline at end of file