diff --git a/src/main/java/com/project/mock/init/MockDataInit.java b/src/main/java/com/project/mock/init/MockDataInit.java
deleted file mode 100644
index f6bff92..0000000
--- a/src/main/java/com/project/mock/init/MockDataInit.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.project.mock.init;
-
-import java.time.LocalDateTime;
-
-import jakarta.annotation.PostConstruct;
-
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.project.mock.infra.entity.MockMessage;
-import com.project.mock.infra.repository.MockMessageRepository;
-
-import lombok.RequiredArgsConstructor;
-
-@Component
-@RequiredArgsConstructor
-public class MockDataInit {
-
-    private final MockMessageRepository repository;
-
-    @PostConstruct
-    @Transactional
-    public void init() {
-        // 데이터 중복 적재 방지
-        if (repository.count() > 0) {
-            return;
-        }
-
-        long subId = 1001L;
-
-        // ==========================================
-        // 1. [EMAIL] 청구서 (스타일 포함 완벽 렌더링)
-        // ==========================================
-        String billHtml =
-                """
-            <style>
-                @import url('https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@300;400;500;700&display=swap');
-                .bill-wrapper { font-family: 'Noto Sans KR', sans-serif; }
-                .bill-header { background: linear-gradient(135deg, #ff77ec 0%, #fa2df9 100%); }
-                .bill-detail-row:nth-child(even) { background-color: #f9fafb; }
-                .status-paid { background-color: #10b981; }
-                .status-pending { background-color: #f59e0b; }
-                .status-overdue { background-color: #ef4444; }
-            </style>
-
-            <div class="bill-wrapper max-w-2xl mx-auto my-8 bg-white rounded-xl shadow-md overflow-hidden"
-                 style="margin-top:0; margin-bottom:0; box-shadow:none; border-radius:0;">
-
-                <div class="bill-header text-white p-6">
-                    <div class="flex justify-between items-start">
-                        <div>
-                            <h1 class="text-2xl font-bold">휴대폰 요금 청구서</h1>
-                            <p class="mt-1 opacity-90">이메일 청구서</p>
-                        </div>
-                        <div class="bg-white/20 p-2 rounded-lg">
-                            <div class="text-xs uppercase tracking-wider">청구 번호</div>
-                            <div class="font-mono font-bold">INV-2026-01-099</div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="p-6 border-b">
-                    <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                        <div>
-                            <h2 class="text-lg font-semibold text-gray-800 mb-2">고객 정보</h2>
-                            <div class="space-y-1">
-                                <p><span class="font-medium text-gray-600">고객명:</span> <span>홍길동</span></p>
-                                <p><span class="font-medium text-gray-600">연락처:</span> <span>010-1234-5678</span></p>
-                                <p><span class="font-medium text-gray-600">이메일:</span> <span>hong@test.com</span></p>
-                                <p><span class="font-medium text-gray-600">요금제:</span> <span>5G 시그니처</span></p>
-                            </div>
-                        </div>
-                        <div>
-                            <h2 class="text-lg font-semibold text-gray-800 mb-2">청구 정보</h2>
-                            <div class="space-y-1">
-                                <p><span class="font-medium text-gray-600">청구 날짜:</span> <span>2026년 01월 22일</span></p>
-                                <p><span class="font-medium text-gray-600">납기일:</span> <span>2026년 01월 31일</span></p>
-                                <p><span class="font-medium text-gray-600">결제 방법:</span> <span>자동이체 (우리은행)</span></p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="p-6 bg-indigo-50">
-                    <div class="flex flex-wrap justify-between items-center">
-                        <div>
-                            <h2 class="text-lg font-semibold text-gray-800">청구 요약</h2>
-                            <p class="text-sm text-gray-600">이번 달 요금 상세 내역입니다</p>
-                        </div>
-                        <div class="mt-2 md:mt-0">
-                            <span class="text-sm font-medium text-gray-600">총 청구 금액</span>
-                            <div class="text-3xl font-bold text-indigo-700">89,500원</div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="p-6">
-                    <h2 class="text-lg font-semibold text-gray-800 mb-4">요금 상세 내역</h2>
-                    <div class="overflow-x-auto">
-                        <table class="min-w-full divide-y divide-gray-200">
-                            <thead class="bg-gray-100">
-                            <tr>
-                                <th class="px-4 py-3 text-left text-xs font-medium
-                                    text-gray-500 uppercase tracking-wider">항목</th>
-                                <th class="px-4 py-3 text-left text-xs font-medium
-                                    text-gray-500 uppercase tracking-wider">상세</th>
-                                <th class="px-4 py-3 text-right text-xs font-medium
-                                    text-gray-500 uppercase tracking-wider">금액</th>
-                            </tr>
-                            </thead>
-                            <tbody class="divide-y divide-gray-200">
-                                <tr class="bill-detail-row">
-                                    <td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">기본 요금</td>
-                                    <td class="px-4 py-3 text-sm text-gray-500">5G 시그니처 110GB</td>
-                                    <td class="px-4 py-3 text-sm text-right text-gray-900">75,000원</td>
-                                </tr>
-                                <tr class="bill-detail-row">
-                                    <td class="px-4 py-3 whitespace-nowrap text-sm
-                                        font-medium text-gray-900">부가 서비스</td>
-                                    <td class="px-4 py-3 text-sm text-gray-500">V 컬러링</td>
-                                    <td class="px-4 py-3 text-sm text-right text-gray-900">3,300원</td>
-                                </tr>
-                                <tr class="bill-detail-row">
-                                    <td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">할인</td>
-                                    <td class="px-4 py-3 text-sm text-gray-500">선택약정 할인</td>
-                                    <td class="px-4 py-3 text-sm text-right text-green-600">-18,750원</td>
-                                </tr>
-                                <tr class="bill-detail-row">
-                                    <td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900">소액 결제</td>
-                                    <td class="px-4 py-3 text-sm text-gray-500">구글 플레이스토어 (NC소프트)</td>
-                                    <td class="px-4 py-3 text-sm text-right text-gray-900">29,950원</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-
-                <div class="p-6 border-t">
-                    <div class="flex flex-wrap justify-between items-center">
-                        <div>
-                            <span class="text-sm font-medium text-gray-600">청구 상태</span>
-                            <div class="mt-1">
-                                <span class="status-paid inline-flex items-center px-3 py-1
-                                    rounded-full text-sm font-medium text-white">
-                                    <i data-feather="check-circle" class="w-4 h-4 mr-1"></i>
-                                    결제 완료
-                                </span>
-                            </div>
-                        </div>
-                        <div class="mt-4 md:mt-0">
-                            <span class="text-sm font-medium text-gray-600">결제 예정일</span>
-                            <div class="mt-1 text-gray-900">2026년 01월 25일</div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="p-6 bg-gray-50 rounded-b-xl">
-                    <h2 class="text-lg font-semibold text-gray-800 mb-3">추가 정보</h2>
-                    <div class="grid grid-cols-1 md:grid-cols-2 gap-4 text-sm">
-                        <div>
-                            <h3 class="font-medium text-gray-700 mb-1">유의사항</h3>
-                            <ul class="space-y-1 text-gray-600">
-                                <li>납기일 이후 결제 시 연체료가 발생할 수 있습니다</li>
-                                <li>문의사항은 고객센터(114)로 연락주세요</li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="p-4 bg-gray-100 text-center text-xs text-gray-500">
-                    <p>이 청구서는 4eum 서비스를 통해 발송되었습니다. © 2026 4eum. All rights reserved.</p>
-                </div>
-            </div>
-            """;
-
-        // 이메일 저장
-        repository.save(
-                MockMessage.builder()
-                        .subId(subId)
-                        .type("EMAIL")
-                        .sender("4eum 통신")
-                        .receiver("hong@test.com")
-                        .subject("[1월] 휴대폰 요금 청구서가 도착했습니다.")
-                        .body(billHtml)
-                        .receivedAt(LocalDateTime.now().minusHours(2))
-                        .build());
-
-        // ==========================================
-        // 2. [SMS] 인증번호
-        // ==========================================
-        repository.save(
-                MockMessage.builder()
-                        .subId(subId)
-                        .type("SMS")
-                        .sender("1544-0010")
-                        .receiver("010-1234-5678")
-                        .subject(null)
-                        .body("[Web 발신] 데이터 사용량 50% 초과하였습니다.")
-                        .receivedAt(LocalDateTime.now().minusMinutes(30))
-                        .build());
-
-        // ==========================================
-        // 3. [SMS] 광고
-        // ==========================================
-        repository.save(
-                MockMessage.builder()
-                        .subId(subId)
-                        .type("SMS")
-                        .sender("02-114")
-                        .receiver("010-1234-5678")
-                        .subject(null)
-                        .body("[Web 발신] 갤럭시 S26 출시 사전예약!\n지금 예약하면 버즈 프로 증정.\n무료수신거부 080-123-4567")
-                        .receivedAt(LocalDateTime.now().minusDays(1))
-                        .build());
-    }
-}
diff --git a/src/main/resources/templates/email.html b/src/main/resources/templates/email.html
index b4789c4..26ac025 100644
--- a/src/main/resources/templates/email.html
+++ b/src/main/resources/templates/email.html
@@ -61,7 +61,6 @@ <h2 class="text-lg font-semibold text-gray-800 mb-2">청구 정보</h2>
                 <div class="space-y-1">
                     <p><span class="font-medium text-gray-600">청구 날짜:</span> <span th:text="${variables.billing_date}">2023년 11월 15일</span></p>
                     <p><span class="font-medium text-gray-600">납기일:</span> <span th:text="${variables.due_date}">2023년 11월 30일</span></p>
-                    <p><span class="font-medium text-gray-600">결제 방법:</span> <span th:text="${variables.payment_method}">신용카드 (KB국민카드)</span></p>
                 </div>
             </div>
         </div>
@@ -92,16 +91,26 @@ <h2 class="text-lg font-semibold text-gray-800 mb-4">요금 상세 내역</h2>
                 </tr>
                 </thead>
                 <tbody class="divide-y divide-gray-200">
+                    <th:block th:each="entry : ${groupedItems}">
+                        <tr class="bill-detail-row" th:each="item, stat : ${entry.value}">
+                            <td th:if="${stat.first}"
+                                th:rowspan="${entry.value.size()}"
+                                th:text="${entry.key}"
+                                class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900 bg-white align-top border-r border-gray-100">
+                                요금제
+                            </td>
 
-                <tr class="bill-detail-row" th:each="item : ${variables.items}">
-                    <td class="px-4 py-3 whitespace-nowrap text-sm font-medium text-gray-900" th:text="${item.name}">기본 요금</td>
-                    <td class="px-4 py-3 text-sm text-gray-500" th:text="${item.detail}">프리미엄 5G 100GB</td>
-
-                    <td class="px-4 py-3 text-sm text-right"
-                        th:classappend="${item.style_class != null ? item.style_class : 'text-gray-900'}"
-                        th:text="${item.amount}">65,000원</td>
-                </tr>
+                            <td class="px-4 py-3 text-sm text-gray-500" th:text="${item.detail}">
+                                5G 스탠다드
+                            </td>
 
+                            <td class="px-4 py-3 text-sm text-right"
+                                th:classappend="${item.styleClass != null ? item.styleClass : 'text-gray-900'}"
+                                th:text="${item.amount}">
+                                3,300원
+                            </td>
+                        </tr>
+                    </th:block>
                 </tbody>
             </table>
         </div>