diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
new file mode 100644
index 00000000..a524b92b
--- /dev/null
+++ b/.github/workflows/main.yaml
@@ -0,0 +1,34 @@
+---
+name: Post Merge
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    name: Build edge
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and publish docker plugin
+        env:
+          REPO: ghcr.io/${{ github.repository }}
+          VERSION: edge
+        run: |-
+          make plugin
+          docker plugin push "$REPO:${TAG_NAME}"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
new file mode 100644
index 00000000..06b4a4ad
--- /dev/null
+++ b/.github/workflows/release.yaml
@@ -0,0 +1,38 @@
+---
+name: Release
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set TAG_NAME in Environment
+      # Subsequent jobs will be have the computed tag name
+        run: echo "TAG_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and publish docker plugin
+        env:
+          REPO: ghcr.io/${{ github.repository }}
+          VERSION: ${{ env.TAG_NAME }}
+        run: |-
+          make plugin
+          docker plugin push "$REPO:${TAG_NAME}"
diff --git a/Makefile b/Makefile
index f69f0d40..f2ccf5de 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 VERSION ?= 0.8
 GO_VERSION := 1.19.1
 GOLANGCI_LINT_VERSION := v1.49.0
-REPO := openpolicyagent/opa-docker-authz
+REPO := openpolicyagent/opa-docker-authz-v2
 
 all: build
 
diff --git a/plugin.sh b/plugin.sh
index 18520d60..eeda1383 100755
--- a/plugin.sh
+++ b/plugin.sh
@@ -10,10 +10,10 @@ docker image build -t rootfsimage .
 id=`docker container create rootfsimage true`
 docker container export "$id" | tar -x -C ./rootfs
 
-echo "Creating plugin "${REPO}-v2:${VERSION}" ..."
-docker plugin create "${REPO}-v2:${VERSION}" .
+echo "Creating plugin "${REPO}:${VERSION}" ..."
+docker plugin create "${REPO}:${VERSION}" .
 
 echo "Cleanup..."
 docker container rm -f "$id" > /dev/null
 docker image rm -f rootfsimage > /dev/null
-rm -rf ./rootfs
\ No newline at end of file
+rm -rf ./rootfs