diff --git a/.github/workflows/docker-agent.yml b/.github/workflows/docker-agent.yml
index 260ffd5..346b746 100644
--- a/.github/workflows/docker-agent.yml
+++ b/.github/workflows/docker-agent.yml
@@ -35,4 +35,6 @@ jobs:
           file: ./agent/Dockerfile
           push: true
           platforms: linux/amd64, linux/arm64, linux/arm/v7
-          tags: ${{ secrets.DOCKER_USERNAME }}/asic-agent:latest
+          tags: |
+            ${{ secrets.DOCKER_USERNAME }}/asic-agent:production
+            ${{ secrets.DOCKER_USERNAME }}/asic-agent:${{ github.event.release.tag_name }}
diff --git a/.github/workflows/docker-api.yml b/.github/workflows/docker-api.yml
index 6cf5bf4..f52249a 100644
--- a/.github/workflows/docker-api.yml
+++ b/.github/workflows/docker-api.yml
@@ -35,4 +35,6 @@ jobs:
           file: ./api/Dockerfile
           push: true
           platforms: linux/amd64, linux/arm64, linux/arm/v7
-          tags: ${{ secrets.DOCKER_USERNAME }}/asic-agent-api:latest
+          tags: |
+            ${{ secrets.DOCKER_USERNAME }}/asic-agent-api:production
+            ${{ secrets.DOCKER_USERNAME }}/asic-agent-api:${{ github.event.release.tag_name }}