diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 158574d..0ddf370 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -58,6 +58,7 @@ jobs:
           fi
 
           echo "name=$image_name" >> "$GITHUB_OUTPUT"
+          echo "manifest=$image_name:${image_tags[0]}" >> "$GITHUB_OUTPUT"
           {
             echo "tags<<EOF"
             printf '%s\n' "${image_tags[@]}"
@@ -67,12 +68,9 @@ jobs:
           podman build \
             --build-arg "SERVICE=$SERVICE" \
             --label "org.opencontainers.image.source=https://github.com/$GITHUB_REPOSITORY" \
-            --tag "$image_name:${image_tags[0]}" \
+            --manifest "$image_name:${image_tags[0]}" \
+            --platform linux/amd64,linux/arm64 \
             .
-
-          for image_tag in "${image_tags[@]:1}"; do
-            podman tag "$image_name:${image_tags[0]}" "$image_name:$image_tag"
-          done
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
           REF_NAME: ${{ github.ref_name }}
@@ -90,9 +88,11 @@ jobs:
         if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
         env:
           IMAGE_NAME: ${{ steps.image.outputs.name }}
+          IMAGE_MANIFEST: ${{ steps.image.outputs.manifest }}
           IMAGE_TAGS: ${{ steps.image.outputs.tags }}
         shell: bash
         run: |
           while IFS= read -r image_tag; do
-            [[ -n "$image_tag" ]] && podman push "$IMAGE_NAME:$image_tag"
+            [[ -n "$image_tag" ]] &&
+              podman manifest push --all "$IMAGE_MANIFEST" "docker://$IMAGE_NAME:$image_tag"
           done <<< "$IMAGE_TAGS"
diff --git a/Dockerfile b/Dockerfile
index 4856bea..c512be1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
 ARG GO_VERSION=1.26
 
-FROM golang:${GO_VERSION}-alpine AS build
+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS build
 ARG SERVICE
+ARG TARGETOS
+ARG TARGETARCH
 WORKDIR /src
 
 COPY go.mod go.sum ./
@@ -9,7 +11,7 @@ RUN go mod download
 
 COPY . .
 RUN go run github.com/swaggo/swag/cmd/swag@v1.8.1 init -g cmd/api-service/main.go --parseInternal --output docs \
-    && CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /out/service ./cmd/${SERVICE}
+    && CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -trimpath -ldflags="-s -w" -o /out/service ./cmd/${SERVICE}
 
 FROM gcr.io/distroless/static-debian13:nonroot
 COPY --from=build /out/service /service
diff --git a/cmd/api-service/main.go b/cmd/api-service/main.go
index 5f99088..1680a53 100644
--- a/cmd/api-service/main.go
+++ b/cmd/api-service/main.go
@@ -15,7 +15,7 @@ import (
 )
 
 // @title TrustPkg API
-// @version 2.0.1
+// @version 2.0.2
 // @description API for searching npm packages and their vulnerability data.
 // @BasePath /api
 // @schemes http https