diff --git a/.github/scripts/release.sh b/.github/scripts/release.sh
new file mode 100644
index 0000000..e0c1ad6
--- /dev/null
+++ b/.github/scripts/release.sh
@@ -0,0 +1,127 @@
+#!/bin/bash
+
+# Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+#
+# This software is the property of WSO2 LLC. and its suppliers, if any.
+# Dissemination of any information or reproduction of any material contained
+# herein in any form is strictly forbidden, unless permitted by WSO2 expressly.
+# You may not alter or remove any copyright or other notice from copies of this content.
+#
+
+# Exit the script on any command with non-zero exit status.
+set -e
+set -o pipefail
+
+# Check the number of arguments passed.
+if [ "$#" -ne 2 ]; then
+    echo "Error: Invalid or insufficient arguments provided!" >&2
+    echo "Usage: $0 <GITHUB_TOKEN> <WORK_DIR>" >&2
+    exit 1
+fi
+
+# Assign command line arguments to variables.
+GIT_TOKEN=$1
+WORK_DIR=$2
+VERSION_TYPE=$3 # possible values: major, minor, patch
+
+BUILD_DIRECTORY="$WORK_DIR/build"
+RELEASE_DIRECTORY="$BUILD_DIRECTORY/releases"
+
+# Configuration variables.
+GIT_EMAIL="iam-cloud@wso2.com"
+GIT_USERNAME="wso2-iam-cloud-bot"
+UPSTREAM_REPO_URL="https://github.com/wso2/open-mcp-auth-proxy.git"
+UPSTREAM_BRANCH="main"
+
+# Configure git.
+git config --global user.email "${GIT_EMAIL}"
+git config --global user.name "${GIT_USERNAME}"
+
+# Navigate to the working directory.
+cd "${WORK_DIR}"
+
+# Set 'origin' to point to the upstream repository.
+git remote set-url origin "${UPSTREAM_REPO_URL}"
+
+# Ensure the latest changes are pulled.
+git checkout ${UPSTREAM_BRANCH}
+git pull
+
+# Create the release directory.
+if [ ! -d "$RELEASE_DIRECTORY" ]; then
+  mkdir -p "$RELEASE_DIRECTORY"
+else
+  rm -rf "$RELEASE_DIRECTORY"/*
+fi
+
+# Extract current version.
+CURRENT_VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "1.0.0")
+IFS='.' read -r MAJOR MINOR PATCH <<< "${CURRENT_VERSION}"
+
+# Determine which part to increment
+case "$VERSION_TYPE" in
+  major)
+    MAJOR=$((MAJOR + 1))
+    MINOR=0
+    PATCH=0
+    ;;
+  minor)
+    MINOR=$((MINOR + 1))
+    PATCH=0
+    ;;
+  patch|*)
+    PATCH=$((PATCH + 1))
+    ;;
+esac
+
+NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}"
+
+echo "Creating release packages for version $NEW_VERSION..."
+
+# List of supported OSes.
+oses=("linux" "linux-arm" "darwin")
+
+# Navigate to the release directory.
+cd "${RELEASE_DIRECTORY}"
+
+for os in "${oses[@]}"; do
+  os_dir="../$os"
+  
+  if [ -d "$os_dir" ]; then
+    release_artifact_folder="openmcpauthproxy_${os}-v${CURRENT_VERSION}"
+    mkdir -p "$release_artifact_folder"
+    cp -r "$os_dir/*" "$release_artifact_folder"
+
+    # Zip the release package.
+    zip_file="$release_artifact_folder.zip"
+    echo "Creating $zip_file..."
+    zip -r "$zip_file" "$release_artifact_folder"
+
+    # Delete the folder after zipping.
+    rm -rf "$release_artifact_folder"
+
+    # Generate checksum file.
+    sha256sum "$zip_file" | sed "s|target/releases/||" > "$zip_file.sha256"
+    echo "Checksum generated for the $os package."
+
+    echo "Release packages created successfully for $os."
+  else
+    echo "Skipping $os release package creation as the build artifacts are not available."
+  fi
+done
+
+echo "Release packages created successfully in $RELEASE_DIRECTORY."
+
+# Navigate back to the project root directory.
+cd "${WORK_DIR}"
+
+# Collect all ZIP and .sha256 files in the target/releases directory.
+FILES_TO_UPLOAD=$(find build/releases -type f \( -name "*.zip" -o -name "*.sha256" \))
+
+# Create a release with the current version.
+TAG_NAME="v${NEW_VERSION}"
+export GITHUB_TOKEN="${GIT_TOKEN}"
+gh release create "${TAG_NAME}" ${FILES_TO_UPLOAD} --title "${TAG_NAME}" --notes "OpenMCPAuthProxy - ${TAG_NAME}" --target "${UPSTREAM_BRANCH}" || { echo "Failed to create release"; exit 1; }
+
+
+echo "Release ${TAG_NAME} created successfully."
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..a1a4a10
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,64 @@
+#
+# Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+#
+# This software is the property of WSO2 LLC. and its suppliers, if any.
+# Dissemination of any information or reproduction of any material contained
+# herein in any form is strictly forbidden, unless permitted by WSO2 expressly.
+# You may not alter or remove any copyright or other notice from copies of this content.
+#
+
+name: Release
+
+on:
+  pull_request:
+    branches: [ main ]
+    types: [closed]
+  workflow_dispatch:
+    inputs:
+      version_type:
+        type: choice
+        description: Choose the type of version update
+        options:
+            - 'major'
+            - 'minor'
+            - 'patch'
+        required: true
+
+jobs:
+  update-and-release:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: 'main'
+          fetch-depth: 0
+          token: ${{ secrets.GIT_BOT_PAT }}
+      - uses: actions/checkout@v2
+
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v3
+        with:
+          go-version: "^1.x"
+
+      - name: Cache Go modules
+        id: cache-go-modules
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-modules-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-modules-
+
+      - name: Install dependencies
+        run: go mod download
+
+      - name: Build and test
+        run: make build
+
+      - name: Update artifact version, package, commit, and create release.
+        env:
+          GITHUB_TOKEN: ${{ secrets.GIT_BOT_PAT }}
+        run: bash ./.github/scripts/release.sh $GITHUB_TOKEN ${{ github.workspace }} ${{ github.event.inputs.version_type }}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 4ceafef..8f19a00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,7 @@ go.sum
 .DS_Store
 
 # builds
-openmcpauthproxy
+build
 
 # test out files
 coverage.out
diff --git a/Makefile b/Makefile
index 7fd2574..1a8495b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # Makefile for open-mcp-auth-proxy
 
 # Variables
+PROJECT_ROOT := $(realpath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
 BINARY_NAME := openmcpauthproxy
 GO := go
 GOFMT := gofmt
@@ -20,16 +21,33 @@ BUILD_OPTS := -v
 # Set test options
 TEST_OPTS := -v -race
 
-.PHONY: all build clean test fmt lint vet coverage help
+.PHONY: all clean test fmt lint vet coverage help
 
 # Default target
-all: lint test build
+all: lint test build-linux build-linux-arm build-darwin
 
-# Build the application
-build: 
-	@echo "Building $(BINARY_NAME)..."
-	@mkdir -p $(BUILD_DIR)
-	$(GO) build $(BUILD_OPTS) -o $(BUILD_DIR)/$(BINARY_NAME) ./cmd/proxy
+build: clean test build-linux build-linux-arm build-darwin
+
+build-linux:
+	mkdir -p $(BUILD_DIR)/linux
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -x -ldflags "-X main.version=$(BUILD_VERSION) \
+	-X 'main.buildDate=$$(date -u '+%Y-%m-%d %H:%M:%S UTC')'" \
+	-o $(BUILD_DIR)/linux/openmcpauthproxy $(PROJECT_ROOT)/cmd/proxy
+	cp config.yaml $(BUILD_DIR)/linux
+
+build-linux-arm:
+	mkdir -p $(BUILD_DIR)/linux-arm
+	GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -x -ldflags "-X main.version=$(BUILD_VERSION) \
+	-X 'main.buildDate=$$(date -u '+%Y-%m-%d %H:%M:%S UTC')'" \
+	-o $(BUILD_DIR)/linux-arm/openmcpauthproxy $(PROJECT_ROOT)/cmd/proxy
+	cp config.yaml $(BUILD_DIR)/linux-arm
+
+build-darwin:
+	mkdir -p $(BUILD_DIR)/darwin
+	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -x -ldflags "-X main.version=$(BUILD_VERSION) \
+	-X 'main.buildDate=$$(date -u '+%Y-%m-%d %H:%M:%S UTC')'" \
+	-o $(BUILD_DIR)/darwin/openmcpauthproxy $(PROJECT_ROOT)/cmd/proxy
+	cp config.yaml $(BUILD_DIR)/darwin
 
 # Clean build artifacts
 clean: