diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 9bb7698..b10625a 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -6,6 +6,14 @@ on:
       component:
         required: true
         type: string
+      dockerfile:
+        required: false
+        type: string
+        default: 'Dockerfile'
+      tag_postfix:
+        required: false
+        type: string
+        default: ''
     secrets:
       docker_username:
         required: true
@@ -44,9 +52,10 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ./${{ inputs.component }}
+          file: ./${{ inputs.component }}/${{ inputs.dockerfile }}
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}${{ inputs.tag_postfix }}
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Update repo description
diff --git a/.github/workflows/release-images.yml b/.github/workflows/release-images.yml
index 68e0fa1..99dd25a 100644
--- a/.github/workflows/release-images.yml
+++ b/.github/workflows/release-images.yml
@@ -23,6 +23,17 @@ jobs:
       docker_token: ${{ secrets.DOCKER_TOKEN }}
       docker_password: ${{ secrets.DOCKER_PASSWORD }}
           
+  collector-metric:
+    uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
+    with:
+      component: pinpoint-collector
+      dockerfile: Dockerfile-metric
+      tag_postfix: -metric
+    secrets:
+      docker_username: ${{ secrets.DOCKER_USERNAME }}
+      docker_token: ${{ secrets.DOCKER_TOKEN }}
+      docker_password: ${{ secrets.DOCKER_PASSWORD }}
+          
   flink:
     uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
     with:
@@ -67,6 +78,17 @@ jobs:
       docker_username: ${{ secrets.DOCKER_USERNAME }}
       docker_token: ${{ secrets.DOCKER_TOKEN }}
       docker_password: ${{ secrets.DOCKER_PASSWORD }}
+                    
+  web-metric:
+    uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
+    with:
+      component: pinpoint-web
+      dockerfile: Dockerfile-metric
+      tag_postfix: -metric
+    secrets:
+      docker_username: ${{ secrets.DOCKER_USERNAME }}
+      docker_token: ${{ secrets.DOCKER_TOKEN }}
+      docker_password: ${{ secrets.DOCKER_PASSWORD }}
           
   batch:
     uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master