diff --git a/app/Http/Controllers/DocumentTemplateController.php b/app/Http/Controllers/DocumentTemplateController.php
index 22d18f54..613402b5 100644
--- a/app/Http/Controllers/DocumentTemplateController.php
+++ b/app/Http/Controllers/DocumentTemplateController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\DocumentTemplate;
-use App\Models\Products\CommonCode;
+use App\Models\Tenants\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
 
@@ -15,7 +15,7 @@ class DocumentTemplateController extends Controller
     public function index(Request $request): View
     {
         return view('document-templates.index', [
-            'documentTypes' => $this->getDocumentTypes(),
+            'categories' => $this->getCategories(),
         ]);
     }
 
@@ -28,7 +28,8 @@ public function create(): View
             'template' => null,
             'templateData' => null,
             'isCreate' => true,
-            'documentTypes' => $this->getDocumentTypes(),
+            'categories' => $this->getCategories(),
+            'tenant' => $this->getCurrentTenant(),
         ]);
     }
 
@@ -51,28 +52,40 @@ public function edit(int $id): View
             'template' => $template,
             'templateData' => $templateData,
             'isCreate' => false,
-            'documentTypes' => $this->getDocumentTypes(),
+            'categories' => $this->getCategories(),
+            'tenant' => $this->getCurrentTenant(),
         ]);
     }
 
     /**
-     * 문서분류 목록 조회 (글로벌 + 테넌트)
+     * 현재 선택된 테넌트 조회
      */
-    private function getDocumentTypes(): array
+    private function getCurrentTenant(): ?Tenant
     {
         $tenantId = session('selected_tenant_id');
 
-        return CommonCode::query()
+        return $tenantId ? Tenant::find($tenantId) : null;
+    }
+
+    /**
+     * 문서분류 목록 조회 (글로벌 + 테넌트, 기존 데이터에서 group by)
+     */
+    private function getCategories(): array
+    {
+        $tenantId = session('selected_tenant_id');
+
+        return DocumentTemplate::query()
             ->where(function ($query) use ($tenantId) {
                 $query->whereNull('tenant_id');
                 if ($tenantId) {
                     $query->orWhere('tenant_id', $tenantId);
                 }
             })
-            ->where('code_group', 'document_type')
-            ->where('is_active', true)
-            ->orderBy('sort_order')
-            ->pluck('name', 'code')
+            ->whereNotNull('category')
+            ->where('category', '!=', '')
+            ->distinct()
+            ->orderBy('category')
+            ->pluck('category')
             ->toArray();
     }
 
@@ -85,9 +98,6 @@ private function prepareTemplateData(DocumentTemplate $template): array
             'name' => $template->name,
             'category' => $template->category,
             'title' => $template->title,
-            'company_name' => $template->company_name,
-            'company_address' => $template->company_address,
-            'company_contact' => $template->company_contact,
             'footer_remark_label' => $template->footer_remark_label,
             'footer_judgement_label' => $template->footer_judgement_label,
             'footer_judgement_options' => $template->footer_judgement_options,
diff --git a/resources/views/document-templates/edit.blade.php b/resources/views/document-templates/edit.blade.php
index 0d3f02db..76c07866 100644
--- a/resources/views/document-templates/edit.blade.php
+++ b/resources/views/document-templates/edit.blade.php
@@ -68,12 +68,13 @@ class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none foc
             <!-- 분류 -->
             <div>
                 <label class="block text-sm font-medium text-gray-700 mb-1">분류</label>
-                <select id="category" class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500">
-                    <option value="">선택하세요</option>
-                    @foreach($documentTypes as $code => $name)
-                        <option value="{{ $name }}">{{ $name }}</option>
+                <input type="text" id="category" list="category-list" placeholder="분류를 입력하거나 선택하세요"
+                       class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500">
+                <datalist id="category-list">
+                    @foreach($categories as $category)
+                        <option value="{{ $category }}">
                     @endforeach
-                </select>
+                </datalist>
             </div>
             <!-- 문서 제목 -->
             <div class="md:col-span-2">
@@ -81,24 +82,6 @@ class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none foc
                 <input type="text" id="title" placeholder="예: 최종 검사 성적서"
                        class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500">
             </div>
-            <!-- 회사명 -->
-            <div>
-                <label class="block text-sm font-medium text-gray-700 mb-1">회사명</label>
-                <input type="text" id="company_name" placeholder="예: 경동기업"
-                       class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500">
-            </div>
-            <!-- 회사 연락처 -->
-            <div>
-                <label class="block text-sm font-medium text-gray-700 mb-1">회사 연락처</label>
-                <input type="text" id="company_contact" placeholder="예: TEL: 02-0000-0000"
-                       class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500">
-            </div>
-            <!-- 회사 주소 -->
-            <div class="md:col-span-2">
-                <label class="block text-sm font-medium text-gray-700 mb-1">회사 주소</label>
-                <input type="text" id="company_address" placeholder="예: 서울시 강남구..."
-                       class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500">
-            </div>
             <!-- 활성 상태 -->
             <div class="flex items-center gap-2">
                 <input type="checkbox" id="is_active" checked class="w-4 h-4 text-blue-600 rounded focus:ring-blue-500">
@@ -188,9 +171,6 @@ class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none foc
         name: '',
         category: '',
         title: '',
-        company_name: '경동기업',
-        company_address: '',
-        company_contact: '',
         footer_remark_label: '비고',
         footer_judgement_label: '종합판정',
         footer_judgement_options: ['합격', '불합격', '조건부합격'],
@@ -214,9 +194,6 @@ function generateId() {
         templateState.name = loadedData.name || '';
         templateState.category = loadedData.category || '';
         templateState.title = loadedData.title || '';
-        templateState.company_name = loadedData.company_name || '';
-        templateState.company_address = loadedData.company_address || '';
-        templateState.company_contact = loadedData.company_contact || '';
         templateState.footer_remark_label = loadedData.footer_remark_label || '';
         templateState.footer_judgement_label = loadedData.footer_judgement_label || '';
         templateState.footer_judgement_options = loadedData.footer_judgement_options || [];
@@ -238,13 +215,10 @@ function initBasicFields() {
         document.getElementById('name').value = templateState.name || '';
         document.getElementById('category').value = templateState.category || '';
         document.getElementById('title').value = templateState.title || '';
-        document.getElementById('company_name').value = templateState.company_name || '';
-        document.getElementById('company_address').value = templateState.company_address || '';
-        document.getElementById('company_contact').value = templateState.company_contact || '';
         document.getElementById('is_active').checked = templateState.is_active;
 
         // 변경 이벤트 바인딩
-        ['name', 'category', 'title', 'company_name', 'company_address', 'company_contact'].forEach(field => {
+        ['name', 'category', 'title'].forEach(field => {
             document.getElementById(field).addEventListener('input', function() {
                 templateState[field] = this.value;
             });
@@ -564,9 +538,6 @@ function saveTemplate() {
             name: name,
             category: document.getElementById('category').value,
             title: document.getElementById('title').value,
-            company_name: document.getElementById('company_name').value,
-            company_address: document.getElementById('company_address').value,
-            company_contact: document.getElementById('company_contact').value,
             is_active: document.getElementById('is_active').checked,
             approval_lines: templateState.approval_lines,
             sections: templateState.sections,
@@ -618,7 +589,7 @@ function closePreviewModal() {
 
     function generatePreviewHtml() {
         const title = document.getElementById('title').value || '검사 성적서';
-        const companyName = document.getElementById('company_name').value || '회사명';
+        const companyName = '{{ $tenant?->company_name ?? "회사명" }}';
 
         return `
             <div class="bg-white p-8 border" style="font-family: 'Malgun Gothic', sans-serif;">
diff --git a/resources/views/document-templates/index.blade.php b/resources/views/document-templates/index.blade.php
index deb85370..a287fd99 100644
--- a/resources/views/document-templates/index.blade.php
+++ b/resources/views/document-templates/index.blade.php
@@ -40,8 +40,8 @@ class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none foc
             <div class="w-full sm:w-40">
                 <select name="category" class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500">
                     <option value="">전체 분류</option>
-                    @foreach($documentTypes as $code => $name)
-                        <option value="{{ $name }}">{{ $name }}</option>
+                    @foreach($categories as $category)
+                        <option value="{{ $category }}">{{ $category }}</option>
                     @endforeach
                 </select>
             </div>