diff --git a/.github/actions/release-major-action/Dockerfile b/.github/actions/release-major-action/Dockerfile
deleted file mode 100644
index 8f6d011..0000000
--- a/.github/actions/release-major-action/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM ghcr.io/shinesolutions/the-works-buildenv:1.8.0
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/actions/release-major-action/action.yaml b/.github/actions/release-major-action/action.yaml
deleted file mode 100644
index 5c2b2a3..0000000
--- a/.github/actions/release-major-action/action.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: 'Release Major'
-runs:
-  using: 'docker'
-  image: 'Dockerfile'
diff --git a/.github/actions/release-major-action/entrypoint.sh b/.github/actions/release-major-action/entrypoint.sh
deleted file mode 100755
index 392ebea..0000000
--- a/.github/actions/release-major-action/entrypoint.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-git config --global user.email "opensource@shinesolutions.com"
-git config --global user.name "Shine Open Source"
-make release-major
\ No newline at end of file
diff --git a/.github/actions/release-minor-action/Dockerfile b/.github/actions/release-minor-action/Dockerfile
deleted file mode 100644
index 8f6d011..0000000
--- a/.github/actions/release-minor-action/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM ghcr.io/shinesolutions/the-works-buildenv:1.8.0
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/actions/release-minor-action/action.yaml b/.github/actions/release-minor-action/action.yaml
deleted file mode 100644
index 520bcdc..0000000
--- a/.github/actions/release-minor-action/action.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: 'Release Minor'
-runs:
-  using: 'docker'
-  image: 'Dockerfile'
diff --git a/.github/actions/release-minor-action/entrypoint.sh b/.github/actions/release-minor-action/entrypoint.sh
deleted file mode 100755
index cea827d..0000000
--- a/.github/actions/release-minor-action/entrypoint.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-git config --global user.email "opensource@shinesolutions.com"
-git config --global user.name "Shine Open Source"
-make release-minor
\ No newline at end of file
diff --git a/.github/actions/release-patch-action/Dockerfile b/.github/actions/release-patch-action/Dockerfile
deleted file mode 100644
index 8f6d011..0000000
--- a/.github/actions/release-patch-action/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM ghcr.io/shinesolutions/the-works-buildenv:1.8.0
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/actions/release-patch-action/action.yaml b/.github/actions/release-patch-action/action.yaml
deleted file mode 100644
index 6fa4148..0000000
--- a/.github/actions/release-patch-action/action.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: 'Release Patch'
-runs:
-  using: 'docker'
-  image: 'Dockerfile'
diff --git a/.github/actions/release-patch-action/entrypoint.sh b/.github/actions/release-patch-action/entrypoint.sh
deleted file mode 100755
index d2f52ad..0000000
--- a/.github/actions/release-patch-action/entrypoint.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-git config --global user.email "opensource@shinesolutions.com"
-git config --global user.name "Shine Open Source"
-make release-patch
\ No newline at end of file
diff --git a/.github/workflows/release-major-workflow.yaml b/.github/workflows/release-major-workflow.yaml
index 9144ff9..49e2936 100644
--- a/.github/workflows/release-major-workflow.yaml
+++ b/.github/workflows/release-major-workflow.yaml
@@ -3,17 +3,11 @@ name: Release Major
 on: [workflow_dispatch]
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: docker/login-action@v1
+      - uses: cliffano/release-action@v2.0.0
         with:
-          registry: ghcr.io
-          username: shinesolutions
-          password: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }}
-      - uses: ./.github/actions/release-major-action
-      - uses: ad-m/github-push-action@master
-        with:
-          tags: true
+          release_type: major
           github_token: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
+          git_user_email: shinesworks@shinesolutions.com
+          git_user_name: Shine Works
diff --git a/.github/workflows/release-minor-workflow.yaml b/.github/workflows/release-minor-workflow.yaml
index f7721e6..2b0affb 100644
--- a/.github/workflows/release-minor-workflow.yaml
+++ b/.github/workflows/release-minor-workflow.yaml
@@ -3,17 +3,11 @@ name: Release Minor
 on: [workflow_dispatch]
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: docker/login-action@v1
+      - uses: cliffano/release-action@v2.0.0
         with:
-          registry: ghcr.io
-          username: shinesolutions
-          password: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }}
-      - uses: ./.github/actions/release-minor-action
-      - uses: ad-m/github-push-action@master
-        with:
-          tags: true
+          release_type: minor
           github_token: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
+          git_user_email: shinesworks@shinesolutions.com
+          git_user_name: Shine Works
diff --git a/.github/workflows/release-patch-workflow.yaml b/.github/workflows/release-patch-workflow.yaml
index d188e8c..6e3cc13 100644
--- a/.github/workflows/release-patch-workflow.yaml
+++ b/.github/workflows/release-patch-workflow.yaml
@@ -3,17 +3,11 @@ name: Release Patch
 on: [workflow_dispatch]
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: docker/login-action@v1
+      - uses: cliffano/release-action@v2.0.0
         with:
-          registry: ghcr.io
-          username: shinesolutions
-          password: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }}
-      - uses: ./.github/actions/release-patch-action
-      - uses: ad-m/github-push-action@master
-        with:
-          tags: true
+          release_type: patch
           github_token: ${{ secrets.SHINEOPENSOURCE_GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
+          git_user_email: shinesworks@shinesolutions.com
+          git_user_name: Shine Works
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68b0fe5..7eb39e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+- Simplify GitHub Actions release workflows to not use custom action
+
+### Fixed
+- Fix release workflows to use SHINEOPENSOURCE_GITHUB_TOKEN instead of SHINEWORKS_GITHUB_TOKEN, matching this repo's original token
+
 ## 3.17.0 - 2024-07-29
 ### Added
 - Add relaxed SSL setting to replication agent when destination is HTTPS #RS-194