diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 0000000..27152cb
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,33 @@
+name-template: "Payment v$RESOLVED_VERSION"
+tag-template: "v$RESOLVED_VERSION"
+categories:
+  - title: "🆕 새로운 기능이 추가되었어요!"
+    label: "✨ Feature"
+  - title: "🐞 자잘한 버그를 수정했습니다."
+    label: "🐞 Bugfix"
+  - title: "🫶🏻 앱 사용성 개선에 힘썼습니다."
+    label: "🫶🏻 Improvement"
+  - title: "🛠️ 더 나은 코드를 위해 노력하고 있습니다."
+    labels:
+      - "🔨 Refactor"
+      - "⚙️ Setting"
+  - title: "ETC"
+    labels:
+      - "*"
+change-template: "* $TITLE (#$NUMBER) by @$AUTHOR"
+change-title-escapes: '\<*_&#@`'
+exclude-labels:
+  - "Main"
+version-resolver:
+  major:
+    labels:
+      - "Major"
+  minor:
+    labels:
+      - "Minor"
+  patch:
+    labels:
+      - "Patch"
+  default: patch
+template: |
+  $CHANGES
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..798a4be
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,61 @@
+name: Release Tag
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        with:
+          config-name: release.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
+
+  deployment:
+    name: Setup, Build, and Deploy
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: write
+      id-token: write
+    steps:
+      - name: Bump version and push tag
+        id: tag_version
+        uses: mathieudutour/github-tag-action@v6.1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      # Set the new tag as a variable
+      - name: Set New Tag Variable
+        id: set_new_tag
+        run: echo "NEW_TAG=${{ steps.tag_version.outputs.new_tag }}" >> $GITHUB_ENV
+
+      - name: Create a GitHub release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.tag_version.outputs.new_tag }}
+          name: Release ${{ steps.tag_version.outputs.new_tag }}
+          body: ${{ steps.tag_version.outputs.changelog }}
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DEV_DOCKER_ID }}
+          password: ${{ secrets.DEV_DOCKER_PW }}
+
+      - name: deploy
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: nowgnas/bb-payment:${{ steps.tag_version.outputs.new_tag }}, nowgnas/bb-payment:latest
diff --git a/src/main/java/kr/bb/payment/repository/PaymentRepository.java b/src/main/java/kr/bb/payment/repository/PaymentRepository.java
index 3fb4722..e9225c8 100644
--- a/src/main/java/kr/bb/payment/repository/PaymentRepository.java
+++ b/src/main/java/kr/bb/payment/repository/PaymentRepository.java
@@ -7,6 +7,6 @@
 
 public interface PaymentRepository extends JpaRepository<Payment, Long> {
     Payment findByOrderId(String orderId);
-    @Query("select p from Payment p where p.orderId = :orderIds")
+    @Query("select p from Payment p where p.orderId in :orderIds")
     List<Payment> findAllByOrderIds(List<String> orderIds);
 }