diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 0000000..f2ed4b0
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,16 @@
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - major
+        - breaking-change
+    - title: New Features 🎉
+      labels:
+        - minor
+        - feature 
+    - title: Other
+
diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml
new file mode 100644
index 0000000..154c6a0
--- /dev/null
+++ b/.github/workflows/release-please.yaml
@@ -0,0 +1,55 @@
+name: Release Please
+
+on:
+  pull_request:
+    types:
+      - closed
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  test:
+    if: |
+      github.event.pull_request.merged == true &&
+      github.ref_name == "master" &&
+      contains(github.event.pull_request.head.name, "release")
+    uses: ./.github/workflows/test.yaml
+
+  release-please:
+    if: |
+      github.event.pull_request.merged == true &&
+      github.ref_name == "master" &&
+      contains(github.event.pull_request.head.name, "release")
+    runs-on: ubuntu-latest
+    needs: [test]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.18.x"
+
+      - name: Build EchoIP binary
+        run: go build -o ./echoip ./cmd/echoip/main.go
+
+      - name: Upload Release Artifact
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          zip -r echoip-linux-amd64.zip echoip html LICENSE
+
+      - uses: google-github-actions/release-please-action@v3
+        with:
+          bootstrap-sha: "ef1f4b388c24e977ec63d6943ac8f0b0c5f51b58"
+          last-release-sha: "32a92399085082121675553e23d722605752519e"
+          release-type: "go"
+          release-as: "1.1.0"
+          command: "release-pr"
+          extra-files: |
+            echoip-linux-amd64-${{  github.ref_name }}.zip 
+            echoip 
+            html 
+            LICENSE
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
deleted file mode 100644
index d63e53f..0000000
--- a/.github/workflows/release.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - "*"
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.18.x"
-
-      - name: Build EchoIP binary
-        run: go build -o ./echoip ./cmd/echoip/main.go
-
-      - name: Upload Release Artifact
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          zip -r echoip-linux-amd64-${{  github.ref_name }}.zip echoip html LICENSE 
-
-      - name: Create Release
-        uses: ncipollo/release-action@v1
-        with:
-          artifacts: echoip-linux-amd64-${{  github.ref_name }}.zip
-          bodyFile: "CHANGELOG.md"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 1637865..312feb8 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,10 +1,13 @@
 name: Test
 
-on: [push]
+on:
+  push:
+    branches:
+      - "*"
+      - "!master"
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
 
     steps: