diff --git a/app/Http/Controllers/SystemSettingController.php b/app/Http/Controllers/SystemSettingController.php
index 12574b2..d25015c 100644
--- a/app/Http/Controllers/SystemSettingController.php
+++ b/app/Http/Controllers/SystemSettingController.php
@@ -3,8 +3,10 @@
 namespace App\Http\Controllers;
 
 use App\Models\Setting;
+use App\Http\Requests\SettingRequest;
 use App\Services\System\SystemSettingService;
 use Illuminate\View\View;
+use Illuminate\Http\RedirectResponse;
 
 class SystemSettingController extends Controller
 {
@@ -25,4 +27,49 @@ class SystemSettingController extends Controller
             'resolved' => $resolved,
         ]);
     }
+
+    public function store(SettingRequest $request, SystemSettingService $service): RedirectResponse
+    {
+        $data = $request->validated();
+
+        $service->set(
+            $data['key'],
+            $request->castedValue(),
+            $data['type'] ?? null,
+            $data['description'] ?? null,
+            $data['group'] ?? null,
+            $data['is_public'] ?? false
+        );
+
+        return redirect()->route('settings.index')->with('success', 'Setting berhasil ditambahkan.');
+    }
+
+    public function update(SettingRequest $request, Setting $setting, SystemSettingService $service): RedirectResponse
+    {
+        $data = $request->validated();
+
+        $service->set(
+            $data['key'],
+            $request->castedValue(),
+            $data['type'] ?? null,
+            $data['description'] ?? null,
+            $data['group'] ?? null,
+            $data['is_public'] ?? false
+        );
+
+        // Pastikan key ikut terbarui jika diubah.
+        if ($setting->key !== $data['key']) {
+            $setting->key = $data['key'];
+        }
+
+        return redirect()->route('settings.index')->with('success', 'Setting berhasil diperbarui.');
+    }
+
+    public function destroy(Setting $setting, SystemSettingService $service): RedirectResponse
+    {
+        $setting->delete();
+        $service->refresh();
+
+        return redirect()->route('settings.index')->with('success', 'Setting berhasil dihapus.');
+    }
 }
diff --git a/app/Http/Requests/SettingRequest.php b/app/Http/Requests/SettingRequest.php
new file mode 100644
index 0000000..9a19031
--- /dev/null
+++ b/app/Http/Requests/SettingRequest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class SettingRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        $settingId = $this->route('setting')?->id;
+
+        return [
+            'key' => [
+                'required',
+                'string',
+                'max:255',
+                Rule::unique('settings', 'key')->ignore($settingId),
+            ],
+            'group' => ['nullable', 'string', 'max:100'],
+            'type' => ['required', 'string', Rule::in(['string', 'integer', 'boolean', 'float', 'array'])],
+            'value' => ['nullable'],
+            'description' => ['nullable', 'string', 'max:255'],
+            'is_public' => ['sometimes', 'boolean'],
+        ];
+    }
+
+    /**
+     * Konversi value sesuai tipe agar konsisten saat disimpan.
+     */
+    public function castedValue(): mixed
+    {
+        $type = $this->input('type');
+        $value = $this->input('value');
+
+        return match ($type) {
+            'boolean' => filter_var($value, FILTER_VALIDATE_BOOL),
+            'integer' => (int) $value,
+            'float' => (float) $value,
+            'array' => $this->toArrayValue($value),
+            default => (string) $value,
+        };
+    }
+
+    private function toArrayValue($value): array
+    {
+        if (is_array($value)) {
+            return $value;
+        }
+
+        // Izinkan input JSON untuk array.
+        $decoded = json_decode($value ?? '', true);
+
+        return is_array($decoded) ? $decoded : [];
+    }
+}
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index e612817..552b490 100644
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -16,8 +16,30 @@
                         <div class="card-title">Daftar Setting</div>
                         <div class="card-subtitle">Nilai yang ditampilkan sudah menerapkan override dari database.</div>
                     </div>
+                    <div class="d-flex align-items-center gap-2">
+                        <button class="btn btn-primary btn-wave" data-bs-toggle="modal" data-bs-target="#createSettingModal">
+                            <i class="ri-add-line me-1"></i>Tambah Setting
+                        </button>
+                    </div>
                 </div>
                 <div class="card-body">
+                    @if(session('success'))
+                        <div class="alert alert-success alert-dismissible" role="alert">
+                            {{ session('success') }}
+                            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+                        </div>
+                    @endif
+
+                    @if($errors->any())
+                        <div class="alert alert-danger">
+                            <ul class="mb-0">
+                                @foreach($errors->all() as $error)
+                                    <li>{{ $error }}</li>
+                                @endforeach
+                            </ul>
+                        </div>
+                    @endif
+
                     @forelse($settingsByGroup as $group => $items)
                         <div class="mb-4">
                             <div class="d-flex align-items-center justify-content-between">
@@ -31,6 +53,7 @@
                                             <th style="width: 25%;">Nilai Aktif</th>
                                             <th style="width: 20%;">Tipe</th>
                                             <th style="width: 30%;">Keterangan</th>
+                                            <th class="text-center" style="width: 10%;">Aksi</th>
                                         </tr>
                                     </thead>
                                     <tbody>
@@ -48,6 +71,27 @@
                                                 </td>
                                                 <td><span class="badge bg-secondary-transparent text-secondary">{{ $setting->type }}</span></td>
                                                 <td class="text-muted">{{ $setting->description ?? '-' }}</td>
+                                                <td class="text-center">
+                                                    <div class="btn-list">
+                                                        <button class="btn btn-sm btn-outline-primary" data-bs-toggle="modal"
+                                                                data-bs-target="#editSettingModal"
+                                                                data-id="{{ $setting->id }}"
+                                                                data-key="{{ $setting->key }}"
+                                                                data-group="{{ $setting->group }}"
+                                                                data-type="{{ $setting->type }}"
+                                                                data-description="{{ $setting->description }}"
+                                                                data-value="{{ is_array($setting->value) ? json_encode($setting->value) : $setting->value }}"
+                                                                data-is-public="{{ $setting->is_public ? '1' : '0' }}">
+                                                            Edit
+                                                        </button>
+                                                        <form action="{{ route('settings.destroy', $setting) }}" method="POST" class="d-inline"
+                                                            onsubmit="return confirm('Hapus setting ini?')">
+                                                            @csrf
+                                                            @method('DELETE')
+                                                            <button type="submit" class="btn btn-sm btn-outline-danger">Hapus</button>
+                                                        </form>
+                                                    </div>
+                                                </td>
                                             </tr>
                                         @endforeach
                                     </tbody>
@@ -63,4 +107,72 @@
             </div>
         </div>
     </div>
+
+    {{-- Modal Tambah --}}
+    <div class="modal fade" id="createSettingModal" tabindex="-1" aria-labelledby="createSettingModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-lg modal-dialog-centered">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="createSettingModalLabel">Tambah Setting</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <form action="{{ route('settings.store') }}" method="POST">
+                    @csrf
+                    <div class="modal-body">
+                        @include('settings.partials.form')
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Batal</button>
+                        <button type="submit" class="btn btn-primary">Simpan</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    {{-- Modal Edit --}}
+    <div class="modal fade" id="editSettingModal" tabindex="-1" aria-labelledby="editSettingModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-lg modal-dialog-centered">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="editSettingModalLabel">Edit Setting</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <form id="editSettingForm" method="POST">
+                    @csrf
+                    @method('PUT')
+                    <div class="modal-body">
+                        @include('settings.partials.form')
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Batal</button>
+                        <button type="submit" class="btn btn-primary">Update</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
 @endsection
+
+@push('scripts')
+<script>
+    const editModal = document.getElementById('editSettingModal');
+    if (editModal) {
+        editModal.addEventListener('show.bs.modal', function (event) {
+            const button = event.relatedTarget;
+            const form = document.getElementById('editSettingForm');
+            const id = button.getAttribute('data-id');
+
+            form.action = "{{ url('settings') }}/" + id;
+
+            // Isi field form dengan data dari tombol edit.
+            form.querySelector('[name="key"]').value = button.getAttribute('data-key') || '';
+            form.querySelector('[name="group"]').value = button.getAttribute('data-group') || '';
+            form.querySelector('[name="type"]').value = button.getAttribute('data-type') || 'string';
+            form.querySelector('[name="description"]').value = button.getAttribute('data-description') || '';
+            form.querySelector('[name="value"]').value = button.getAttribute('data-value') || '';
+            form.querySelector('[name="is_public"]').checked = button.getAttribute('data-is-public') === '1';
+        });
+    }
+</script>
+@endpush
diff --git a/resources/views/settings/partials/form.blade.php b/resources/views/settings/partials/form.blade.php
new file mode 100644
index 0000000..cb38dd6
--- /dev/null
+++ b/resources/views/settings/partials/form.blade.php
@@ -0,0 +1,40 @@
+<div class="row g-3">
+    <div class="col-md-6">
+        <label class="form-label">Key</label>
+        <input type="text" name="key" class="form-control" placeholder="mis: asset.code_prefix" required>
+        <small class="text-muted">Gunakan format dot notation untuk pengelompokan.</small>
+    </div>
+    <div class="col-md-3">
+        <label class="form-label">Group</label>
+        <input type="text" name="group" class="form-control" placeholder="asset/ui/security">
+    </div>
+    <div class="col-md-3">
+        <label class="form-label">Tipe</label>
+        <select name="type" class="form-select" required>
+            <option value="string">String</option>
+            <option value="integer">Integer</option>
+            <option value="float">Float</option>
+            <option value="boolean">Boolean</option>
+            <option value="array">Array (JSON)</option>
+        </select>
+    </div>
+
+    <div class="col-md-12">
+        <label class="form-label">Nilai</label>
+        <textarea name="value" class="form-control" rows="3" placeholder="Isi sesuai tipe, array gunakan JSON"></textarea>
+    </div>
+
+    <div class="col-md-9">
+        <label class="form-label">Deskripsi</label>
+        <input type="text" name="description" class="form-control" placeholder="Catatan untuk pengguna">
+    </div>
+
+    <div class="col-md-3 d-flex align-items-end">
+        <div class="form-check">
+            <input class="form-check-input" type="checkbox" name="is_public" value="1" id="isPublicCheck">
+            <label class="form-check-label" for="isPublicCheck">
+                Dapat dilihat publik
+            </label>
+        </div>
+    </div>
+</div>
diff --git a/routes/web.php b/routes/web.php
index c1c12ba..55cddbe 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -18,4 +18,4 @@ Route::get('/', function () {
 // Route::get('/', [DashboardsController::class, 'index']);
 Route::get('index', [DashboardsController::class, 'index']);
 
-Route::get('settings', [SystemSettingController::class, 'index'])->name('settings.index');
+Route::resource('settings', SystemSettingController::class)->only(['index', 'store', 'update', 'destroy']);