diff --git a/.github/workflows/docker-image-agent.yml b/.github/workflows/docker-image-agent.yml
deleted file mode 100644
index 9b32deb..0000000
--- a/.github/workflows/docker-image-agent.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Docker Image CI (agent)
-
-on:
-  push:
-    tags: ["*"]
-
-jobs:
-  call-main-workflow:
-    uses: ./.github/workflows/docker-image.yml
-    with:
-      make_args: "agent=1"
-      image_name: ${{ github.repository_owner }}/godoxy-agent
diff --git a/.github/workflows/docker-image-main-old.yml b/.github/workflows/docker-image-main-old.yml
deleted file mode 100644
index 5469770..0000000
--- a/.github/workflows/docker-image-main-old.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: Docker Image CI (main)
-
-on:
-  push:
-    tags: ["*"]
-
-jobs:
-  call-main-workflow:
-    uses: ./.github/workflows/docker-image.yml
diff --git a/.github/workflows/docker-image-main.yml b/.github/workflows/docker-image-main.yml
deleted file mode 100644
index dded02f..0000000
--- a/.github/workflows/docker-image-main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Docker Image CI (main)
-
-on:
-  push:
-    tags: ["*"]
-
-jobs:
-  call-main-workflow:
-    uses: ./.github/workflows/docker-image.yml
-    with:
-      image_name: ${{ github.repository_owner }}/godoxy
diff --git a/.github/workflows/docker-image-nightly.yml b/.github/workflows/docker-image-nightly.yml
new file mode 100644
index 0000000..72091f2
--- /dev/null
+++ b/.github/workflows/docker-image-nightly.yml
@@ -0,0 +1,22 @@
+name: Docker Image CI (nightly)
+
+on:
+  push:
+    branches:
+      - "*" # matches every branch that doesn't contain a '/'
+      - "*/*" # matches every branch containing a single '/'
+      - "**" # matches every branch
+      - "!main" # excludes master
+
+jobs:
+  build-nightly:
+    uses: ./.github/workflows/docker-image.yml
+    with:
+      image_name: ${{ github.repository_owner }}/godoxy
+      tag: nightly
+  build-nightly-agent:
+    uses: ./.github/workflows/docker-image.yml
+    with:
+      image_name: ${{ github.repository_owner }}/godoxy-agent
+      tag: nightly
+      agent: true
diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml
new file mode 100644
index 0000000..643b7fb
--- /dev/null
+++ b/.github/workflows/docker-image-prod.yml
@@ -0,0 +1,20 @@
+name: Docker Image CI
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build-prod:
+    uses: ./.github/workflows/docker-image.yml
+    with:
+      image_name: ${{ github.repository_owner }}/godoxy
+      old_image_name: ${{ github.repository_owner }}/go-proxy
+      tag: latest
+  build-prod-agent:
+    uses: ./.github/workflows/docker-image.yml
+    with:
+      image_name: ${{ github.repository_owner }}/godoxy-agent
+      tag: latest
+      agent: true
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index ab403e1..78895c0 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -3,25 +3,39 @@ name: Docker Image CI
 on:
   workflow_call:
     inputs:
-      make_args:
-        description: "Arguments to pass to make"
+      tag:
+        required: true
         type: string
-        required: false
-        default: ""
       image_name:
-        description: "Image name"
+        required: true
         type: string
+      old_image_name:
         required: false
-        default: ${{ github.repository }}
+        type: string
+      agent:
+        required: false
+        default: false
+        type: boolean
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ inputs.image_name }}
+  MAKE_ARGS: agent=${{ inputs.agent && '1' || '0' }}
+  DIGEST_PATH: /tmp/digests/${{ inputs.agent && 'agent' || 'main' }}
+  DIGEST_NAME_SUFFIX: ${{ inputs.agent && 'agent' || 'main' }}
 
 jobs:
   build:
-    name: Build multi-platform Docker image
-    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: ubuntu-latest
+            platform: linux/amd64
+          - runner: ubuntu-24.04-arm
+            platform: linux/arm64
+
+    name: Build ${{ matrix.platform }}
+    runs-on: ${{ matrix.runner }}
 
     permissions:
       contents: read
@@ -29,14 +43,6 @@ jobs:
       id-token: write
       attestations: write
 
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          # - linux/arm/v6
-          # - linux/arm/v7
-          - linux/arm64
     steps:
       - name: Prepare
         run: |
@@ -47,13 +53,15 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+          images: ${{ env.REGISTRY }}/${{ inputs.image_name }}
+          tags: |
+            type=raw,value=${{ inputs.tag }},event=branch
+            type=ref,event=tag
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          platforms: ${{ matrix.platform }}
 
       - name: Login to registry
         uses: docker/login-action@v3
@@ -68,47 +76,49 @@ jobs:
         with:
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=${{ env.REGISTRY }}/${{ inputs.image_name }},push-by-digest=true,name-canonical=true,push=true
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |
             VERSION=${{ github.ref_name }}
-            MAKE_ARGS=${{ inputs.make_args }}
+            MAKE_ARGS=${{ env.MAKE_ARGS }}
 
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
         with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
+          subject-name: ${{ env.REGISTRY }}/${{ inputs.image_name }}
           subject-digest: ${{ steps.build.outputs.digest }}
           push-to-registry: true
 
       - name: Export digest
         run: |
-          mkdir -p /tmp/digests
+          mkdir -p ${{ env.DIGEST_PATH }}
           digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
+          touch "${{ env.DIGEST_PATH }}/${digest#sha256:}"
 
       - name: Upload digest
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: /tmp/digests/*
+          name: digests-${{ env.PLATFORM_PAIR }}-${{ env.DIGEST_NAME_SUFFIX }}
+          path: ${{ env.DIGEST_PATH }}/*
           if-no-files-found: error
           retention-days: 1
+
   merge:
-    runs-on: ubuntu-22.04
-    needs:
-      - build
+    needs: build
+    runs-on: ubuntu-latest
+
     permissions:
       contents: read
       packages: write
       id-token: write
+
     steps:
       - name: Download digests
         uses: actions/download-artifact@v4
         with:
-          path: /tmp/digests
-          pattern: digests-*
+          path: ${{ env.DIGEST_PATH }}
+          pattern: digests-*-${{ env.DIGEST_NAME_SUFFIX }}
           merge-multiple: true
 
       - name: Set up Docker Buildx
@@ -118,7 +128,10 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}/${{ inputs.image_name }}
+          tags: |
+            type=raw,value=${{ inputs.tag }},event=branch
+            type=ref,event=tag
 
       - name: Login to registry
         uses: docker/login-action@v3
@@ -129,11 +142,21 @@ jobs:
 
       - name: Create manifest list and push
         id: push
-        working-directory: /tmp/digests
+        working-directory: ${{ env.DIGEST_PATH }}
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
+            $(printf '${{ env.REGISTRY }}/${{ inputs.image_name }}@sha256:%s ' *)
+
+      - name: Old image name
+        if: inputs.old_image_name != ''
+        run: |
+          docker buildx imagetools create -t ${{ env.REGISTRY }}/${{ inputs.old_image_name }}:${{ steps.meta.outputs.version }}\
+            ${{ env.REGISTRY }}/${{ inputs.image_name }}:${{ steps.meta.outputs.version }}
 
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ inputs.image_name }}:${{ steps.meta.outputs.version }}
+
+      - name: Inspect image (old)
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ inputs.old_image_name }}:${{ steps.meta.outputs.version }}