diff --git a/.github/workflows/publish-tags.yml b/.github/workflows/publish-tags.yml
new file mode 100644
index 00000000..d4b721cf
--- /dev/null
+++ b/.github/workflows/publish-tags.yml
@@ -0,0 +1,77 @@
+name: Release Image
+
+on:
+  push:
+    tags:
+      - "v*"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build_and_push_image:
+    name: build image and push to Docker Hub
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    # if: github.repository_owner == 'neodb-social'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+
+      - name: Check git version
+        id: version
+        run: |
+          echo "neodb=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          cd neodb-takahe
+          echo "takahe=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Send Discord notification
+        uses: appleboy/discord-action@master
+        with:
+          webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}
+          webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
+          color: "#1857a4"
+          message: Building release image ${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: neodb/neodb
+          tags: |
+            type=raw,value=latest
+            type=semver,pattern={{version}}
+            type=raw,value=${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }}
+
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: "linux/amd64,linux/arm64"
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Send Discord notification complete
+        uses: appleboy/discord-action@master
+        with:
+          webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}
+          webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
+          color: "#1857a4"
+          message: Published release image ${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 28278fc2..a9893497 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: docker image
+name: Development Image
 
 on:
   workflow_run:
@@ -37,7 +37,7 @@ jobs:
           webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}
           webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
           color: "#1857a4"
-          message: Building docker image ${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }}
+          message: Building development image ${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -45,11 +45,13 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Docker meta
+      - name: Docker metadata
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: neodb/neodb
+          tags: |
+            type=edge,branch=main
 
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
@@ -73,4 +75,4 @@ jobs:
           webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}
           webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
           color: "#1857a4"
-          message: Published docker image ${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }}
+          message: Published development image ${{ steps.version.outputs.neodb }}-${{ steps.version.outputs.takahe }}
diff --git a/compose.yml b/compose.yml
index 91c90e8a..a6cd240a 100644
--- a/compose.yml
+++ b/compose.yml
@@ -13,7 +13,7 @@ version: "3.8"
 x-shared:
   neodb-service: &neodb-service
     build: .
-    image: ${NEODB_IMAGE:-neodb/neodb:main}
+    image: ${NEODB_IMAGE:-neodb/neodb:latest}
     environment:
       NEODB_DEBUG:
       NEODB_SECRET_KEY: