diff --git a/extensions/Servers/Proxmox/Livewire/Firewall.php b/extensions/Servers/Proxmox/Livewire/Firewall.php
new file mode 100644
index 000000000..8b088a9db
--- /dev/null
+++ b/extensions/Servers/Proxmox/Livewire/Firewall.php
@@ -0,0 +1,379 @@
+<?php
+
+namespace Paymenter\Extensions\Servers\Proxmox\Livewire;
+
+use Illuminate\Http\Client\RequestException;
+use Paymenter\Extensions\Servers\Proxmox\Models\Server;
+use Paymenter\Extensions\Servers\Proxmox\Proxmox;
+
+class Firewall extends Component
+{
+    public bool $firewallEnabled = false;
+    public array $rules = [];
+    public array $aliases = [];
+    public array $ipsets = [];
+    public bool $loading = false;
+    public string $error = '';
+
+    // Rule creation/editing
+    public ?int $editingRulePos = null;
+    public string $ruleAction = 'ACCEPT';
+    public string $ruleSource = '';
+    public string $ruleDest = '';
+    public string $ruleProto = '';
+    public string $ruleDport = '';
+    public string $ruleSport = '';
+    public string $ruleComment = '';
+    public bool $ruleEnable = true;
+    public string $ruleMacro = '';
+    public string $ruleIface = '';
+    public string $ruleLog = '';
+
+    // Alias management
+    public string $aliasName = '';
+    public string $aliasCidr = '';
+    public string $aliasComment = '';
+
+    // IPSet management
+    public string $ipsetName = '';
+    public string $ipsetComment = '';
+
+    public function mount(Server $server): void
+    {
+        parent::mount($server);
+        $this->loadFirewallOptions();
+        $this->loadFirewallRules();
+        $this->loadAliases();
+        $this->loadIpsets();
+    }
+
+    public function loadFirewallOptions(): void
+    {
+        try {
+            $proxmox = new Proxmox;
+            $response = $proxmox->request(
+                '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/options'
+            );
+            $data = $response->json()['data'] ?? [];
+            $this->firewallEnabled = isset($data['enable']) && $data['enable'] == 1;
+            $this->error = '';
+        } catch (\Exception $e) {
+            $this->error = 'Failed to load firewall options: ' . $e->getMessage();
+            $this->firewallEnabled = false;
+        }
+    }
+
+    public function toggleFirewall(): void
+    {
+        $this->loading = true;
+        try {
+            $proxmox = new Proxmox;
+            $response = $proxmox->request(
+                '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/options',
+                'put',
+                ['enable' => $this->firewallEnabled ? 0 : 1]
+            );
+
+            if ($response->successful()) {
+                $this->firewallEnabled = !$this->firewallEnabled;
+                $this->notify('Firewall ' . ($this->firewallEnabled ? 'enabled' : 'disabled') . ' successfully', 'success');
+                $this->loadFirewallOptions();
+            } else {
+                $message = $response->json()['errors'][0]['message'] ?? 'Unknown error';
+                $this->notify('Failed to toggle firewall: ' . $message, 'error');
+            }
+        } catch (\Exception $e) {
+            $this->notify('Failed to toggle firewall: ' . $e->getMessage(), 'error');
+        } finally {
+            $this->loading = false;
+        }
+    }
+
+    public function loadFirewallRules(): void
+    {
+        try {
+            $proxmox = new Proxmox;
+            $response = $proxmox->request(
+                '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/rules'
+            );
+            $data = $response->json()['data'] ?? [];
+            $this->rules = is_array($data) ? $data : [];
+            $this->error = '';
+        } catch (\Exception $e) {
+            $this->error = 'Failed to load firewall rules: ' . $e->getMessage();
+            $this->rules = [];
+        }
+    }
+
+    public function startCreateRule(): void
+    {
+        $this->resetRuleForm();
+        $this->editingRulePos = null;
+    }
+
+    public function startEditRule(int $pos): void
+    {
+        $rule = collect($this->rules)->firstWhere('pos', $pos);
+        if ($rule) {
+            $this->editingRulePos = $pos;
+            $this->ruleAction = $rule['action'] ?? 'ACCEPT';
+            $this->ruleSource = $rule['source'] ?? '';
+            $this->ruleDest = $rule['dest'] ?? '';
+            $this->ruleProto = $rule['proto'] ?? '';
+            $this->ruleDport = $rule['dport'] ?? '';
+            $this->ruleSport = $rule['sport'] ?? '';
+            $this->ruleComment = $rule['comment'] ?? '';
+            $this->ruleEnable = !isset($rule['enable']) || $rule['enable'] == 1;
+            $this->ruleMacro = $rule['macro'] ?? '';
+            $this->ruleIface = $rule['iface'] ?? '';
+            $this->ruleLog = $rule['log'] ?? '';
+        }
+    }
+
+    public function resetRuleForm(): void
+    {
+        $this->ruleAction = 'ACCEPT';
+        $this->ruleSource = '';
+        $this->ruleDest = '';
+        $this->ruleProto = '';
+        $this->ruleDport = '';
+        $this->ruleSport = '';
+        $this->ruleComment = '';
+        $this->ruleEnable = true;
+        $this->ruleMacro = '';
+        $this->ruleIface = '';
+        $this->ruleLog = '';
+    }
+
+    public function saveRule(): void
+    {
+        $this->loading = true;
+        try {
+            $proxmox = new Proxmox;
+            $payload = array_filter([
+                'action' => $this->ruleAction,
+                'source' => $this->ruleSource ?: null,
+                'dest' => $this->ruleDest ?: null,
+                'proto' => $this->ruleProto ?: null,
+                'dport' => $this->ruleDport ?: null,
+                'sport' => $this->ruleSport ?: null,
+                'comment' => $this->ruleComment ?: null,
+                'enable' => $this->ruleEnable ? 1 : 0,
+                'macro' => $this->ruleMacro ?: null,
+                'iface' => $this->ruleIface ?: null,
+                'log' => $this->ruleLog ?: null,
+            ], fn($value) => $value !== null);
+
+            if ($this->editingRulePos !== null) {
+                // Update existing rule
+                $response = $proxmox->request(
+                    '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/rules/' . $this->editingRulePos,
+                    'put',
+                    $payload
+                );
+            } else {
+                // Create new rule
+                $response = $proxmox->request(
+                    '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/rules',
+                    'post',
+                    $payload
+                );
+            }
+
+            if ($response->successful()) {
+                $this->notify('Rule ' . ($this->editingRulePos !== null ? 'updated' : 'created') . ' successfully', 'success');
+                $this->resetRuleForm();
+                $this->editingRulePos = null;
+                $this->loadFirewallRules();
+            } else {
+                $message = $response->json()['errors'][0]['message'] ?? 'Unknown error';
+                $this->notify('Failed to save rule: ' . $message, 'error');
+            }
+        } catch (\Exception $e) {
+            $this->notify('Failed to save rule: ' . $e->getMessage(), 'error');
+        } finally {
+            $this->loading = false;
+        }
+    }
+
+    public function deleteRule(int $pos): void
+    {
+        $this->loading = true;
+        try {
+            $proxmox = new Proxmox;
+            $response = $proxmox->request(
+                '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/rules/' . $pos,
+                'delete'
+            );
+
+            if ($response->successful()) {
+                $this->notify('Rule deleted successfully', 'success');
+                $this->loadFirewallRules();
+            } else {
+                $message = $response->json()['errors'][0]['message'] ?? 'Unknown error';
+                $this->notify('Failed to delete rule: ' . $message, 'error');
+            }
+        } catch (\Exception $e) {
+            $this->notify('Failed to delete rule: ' . $e->getMessage(), 'error');
+        } finally {
+            $this->loading = false;
+        }
+    }
+
+    public function loadAliases(): void
+    {
+        try {
+            $proxmox = new Proxmox;
+            $response = $proxmox->request(
+                '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/aliases'
+            );
+            $data = $response->json()['data'] ?? [];
+            $this->aliases = is_array($data) ? $data : [];
+        } catch (\Exception $e) {
+            $this->aliases = [];
+        }
+    }
+
+    public function createAlias(): void
+    {
+        if (empty($this->aliasName) || empty($this->aliasCidr)) {
+            $this->notify('Name and CIDR are required', 'error');
+            return;
+        }
+
+        $this->loading = true;
+        try {
+            $proxmox = new Proxmox;
+            $payload = [
+                'name' => $this->aliasName,
+                'cidr' => $this->aliasCidr,
+            ];
+            if ($this->aliasComment) {
+                $payload['comment'] = $this->aliasComment;
+            }
+
+            $response = $proxmox->request(
+                '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/aliases',
+                'post',
+                $payload
+            );
+
+            if ($response->successful()) {
+                $this->notify('Alias created successfully', 'success');
+                $this->aliasName = '';
+                $this->aliasCidr = '';
+                $this->aliasComment = '';
+                $this->loadAliases();
+            } else {
+                $message = $response->json()['errors'][0]['message'] ?? 'Unknown error';
+                $this->notify('Failed to create alias: ' . $message, 'error');
+            }
+        } catch (\Exception $e) {
+            $this->notify('Failed to create alias: ' . $e->getMessage(), 'error');
+        } finally {
+            $this->loading = false;
+        }
+    }
+
+    public function deleteAlias(string $name): void
+    {
+        $this->loading = true;
+        try {
+            $proxmox = new Proxmox;
+            $response = $proxmox->request(
+                '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/aliases/' . $name,
+                'delete'
+            );
+
+            if ($response->successful()) {
+                $this->notify('Alias deleted successfully', 'success');
+                $this->loadAliases();
+            } else {
+                $message = $response->json()['errors'][0]['message'] ?? 'Unknown error';
+                $this->notify('Failed to delete alias: ' . $message, 'error');
+            }
+        } catch (\Exception $e) {
+            $this->notify('Failed to delete alias: ' . $e->getMessage(), 'error');
+        } finally {
+            $this->loading = false;
+        }
+    }
+
+    public function loadIpsets(): void
+    {
+        try {
+            $proxmox = new Proxmox;
+            $response = $proxmox->request(
+                '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/ipset'
+            );
+            $data = $response->json()['data'] ?? [];
+            $this->ipsets = is_array($data) ? $data : [];
+        } catch (\Exception $e) {
+            $this->ipsets = [];
+        }
+    }
+
+    public function createIpset(): void
+    {
+        if (empty($this->ipsetName)) {
+            $this->notify('Name is required', 'error');
+            return;
+        }
+
+        $this->loading = true;
+        try {
+            $proxmox = new Proxmox;
+            $payload = [
+                'name' => $this->ipsetName,
+            ];
+            if ($this->ipsetComment) {
+                $payload['comment'] = $this->ipsetComment;
+            }
+
+            $response = $proxmox->request(
+                '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/ipset',
+                'post',
+                $payload
+            );
+
+            if ($response->successful()) {
+                $this->notify('IP set created successfully', 'success');
+                $this->ipsetName = '';
+                $this->ipsetComment = '';
+                $this->loadIpsets();
+            } else {
+                $message = $response->json()['errors'][0]['message'] ?? 'Unknown error';
+                $this->notify('Failed to create IP set: ' . $message, 'error');
+            }
+        } catch (\Exception $e) {
+            $this->notify('Failed to create IP set: ' . $e->getMessage(), 'error');
+        } finally {
+            $this->loading = false;
+        }
+    }
+
+    public function deleteIpset(string $name): void
+    {
+        $this->loading = true;
+        try {
+            $proxmox = new Proxmox;
+            $response = $proxmox->request(
+                '/nodes/' . $this->server->node->name . '/qemu/' . $this->server->vm_id . '/firewall/ipset/' . $name,
+                'delete'
+            );
+
+            if ($response->successful()) {
+                $this->notify('IP set deleted successfully', 'success');
+                $this->loadIpsets();
+            } else {
+                $message = $response->json()['errors'][0]['message'] ?? 'Unknown error';
+                $this->notify('Failed to delete IP set: ' . $message, 'error');
+            }
+        } catch (\Exception $e) {
+            $this->notify('Failed to delete IP set: ' . $e->getMessage(), 'error');
+        } finally {
+            $this->loading = false;
+        }
+    }
+}
+
diff --git a/extensions/Servers/Proxmox/Proxmox.php b/extensions/Servers/Proxmox/Proxmox.php
index 30260e797..2c4a3b0da 100644
--- a/extensions/Servers/Proxmox/Proxmox.php
+++ b/extensions/Servers/Proxmox/Proxmox.php
@@ -36,6 +36,7 @@ class Proxmox extends ClassServer
         View::addNamespace('proxmox', __DIR__ . '/views');
 
         \Livewire\Livewire::component('proxmox.overview', \Paymenter\Extensions\Servers\Proxmox\Livewire\Overview::class);
+        \Livewire\Livewire::component('proxmox.firewall', \Paymenter\Extensions\Servers\Proxmox\Livewire\Firewall::class);
         \Livewire\Livewire::component('proxmox.network', \Paymenter\Extensions\Servers\Proxmox\Livewire\Network::class);
         \Livewire\Livewire::component('proxmox.index', \Paymenter\Extensions\Servers\Proxmox\Livewire\Index::class);
         \Livewire\Livewire::component('proxmox.server', \Paymenter\Extensions\Servers\Proxmox\Livewire\Server::class);
diff --git a/extensions/Servers/Proxmox/routes.php b/extensions/Servers/Proxmox/routes.php
index 196695fa7..675cd5f70 100644
--- a/extensions/Servers/Proxmox/routes.php
+++ b/extensions/Servers/Proxmox/routes.php
@@ -7,6 +7,7 @@ use Paymenter\Extensions\Servers\Proxmox\Livewire\CloudInit;
 use Paymenter\Extensions\Servers\Proxmox\Livewire\Display;
 use Paymenter\Extensions\Servers\Proxmox\Livewire\Index;
 use Paymenter\Extensions\Servers\Proxmox\Http\Controllers\LiveTrafficController;
+use Paymenter\Extensions\Servers\Proxmox\Livewire\Firewall;
 use Paymenter\Extensions\Servers\Proxmox\Livewire\Network;
 use Paymenter\Extensions\Servers\Proxmox\Livewire\Overview;
 use Paymenter\Extensions\Servers\Proxmox\Livewire\Subdomain;
@@ -23,6 +24,7 @@ Route::group([
 ], function () {
     Route::get('/', Index::class)->name('index');
     Route::get('{server}', Overview::class)->name('server.overview');
+    Route::get('{server}/firewall', Firewall::class)->name('server.firewall');
     Route::get('{server}/network', Network::class)->name('server.network');
     Route::get('{server}/live-traffic', LiveTrafficController::class)->name('server.live-traffic');
     Route::get('{server}/boot-order', BootOrder::class)->name('server.boot-order');
diff --git a/extensions/Servers/Proxmox/views/components/layout.blade.php b/extensions/Servers/Proxmox/views/components/layout.blade.php
index 92aa1a734..cb1c1ff4c 100644
--- a/extensions/Servers/Proxmox/views/components/layout.blade.php
+++ b/extensions/Servers/Proxmox/views/components/layout.blade.php
@@ -153,6 +153,7 @@
                     ['label' => 'Overview', 'view' => 'overview', 'route' => route('proxmox.server.overview', ['server' => $server->id])],
                     ['label' => 'Statistics', 'view' => 'statistics', 'route' => route('proxmox.server.statistics', ['server' => $server->id]), 'advanced' => true],
                     ['label' => 'Boot Settings', 'view' => 'boot-order', 'route' => route('proxmox.server.boot-order', ['server' => $server->id]), 'advanced' => true],
+                    ['label' => 'Firewall', 'view' => 'firewall', 'route' => route('proxmox.server.firewall', ['server' => $server->id])],
                     ['label' => 'Network', 'view' => 'network', 'route' => route('proxmox.server.network', ['server' => $server->id])],
                     ['label' => 'Subdomain', 'view' => 'subdomain', 'route' => route('proxmox.server.subdomain', ['server' => $server->id]), 'advanced' => true],
                     ['label' => 'Cloud-init', 'view' => 'cloud-init', 'route' => route('proxmox.server.cloud-init', ['server' => $server->id]), 'advanced' => true],
diff --git a/extensions/Servers/Proxmox/views/firewall.blade.php b/extensions/Servers/Proxmox/views/firewall.blade.php
new file mode 100644
index 000000000..3bdc50b9a
--- /dev/null
+++ b/extensions/Servers/Proxmox/views/firewall.blade.php
@@ -0,0 +1,366 @@
+<x-proxmox::layout :server="$server" view="firewall" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
+
+<div class="space-y-6">
+    <!-- Firewall Status Card -->
+    <div class="bg-background border border-neutral rounded-lg p-6">
+        <div class="flex items-center justify-between mb-4">
+            <div class="flex items-center gap-3">
+                <div class="flex items-center justify-center w-10 h-10 rounded-lg bg-primary/10">
+                    <x-ri-shield-line class="size-5 text-primary" />
+                </div>
+                <div>
+                    <h2 class="text-xl font-semibold">Firewall Status</h2>
+                    <p class="text-sm text-base/60 mt-1">Enable or disable the firewall for this virtual machine</p>
+                </div>
+            </div>
+            <label class="inline-flex items-center cursor-pointer">
+                <input 
+                    type="checkbox" 
+                    wire:model.live="firewallEnabled"
+                    wire:click="toggleFirewall"
+                    :disabled="loading"
+                    class="sr-only peer">
+                <div class="relative w-11 h-6 bg-gray-200 dark:bg-gray-700 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all peer-checked:bg-blue-600"></div>
+            </label>
+        </div>
+        @if($error)
+            <div class="bg-error/10 border border-error/30 rounded-lg p-3 mt-4">
+                <p class="text-sm text-error">{{ $error }}</p>
+            </div>
+        @endif
+    </div>
+
+    @if($firewallEnabled)
+        <!-- Firewall Rules Card -->
+        <div class="bg-background border border-neutral rounded-lg p-6">
+            <div class="flex items-center justify-between mb-4">
+                <div class="flex items-center gap-3">
+                    <div class="flex items-center justify-center w-10 h-10 rounded-lg bg-primary/10">
+                        <x-ri-list-check class="size-5 text-primary" />
+                    </div>
+                    <div>
+                        <h2 class="text-xl font-semibold">Firewall Rules</h2>
+                        <p class="text-sm text-base/60 mt-1">Manage allow and block rules for network traffic</p>
+                    </div>
+                </div>
+                <button 
+                    wire:click="startCreateRule"
+                    class="px-4 py-2 bg-primary text-white rounded-lg hover:bg-primary/90 transition-colors text-sm font-medium">
+                    <x-ri-add-line class="size-4 inline mr-1" />
+                    Add Rule
+                </button>
+            </div>
+
+            <!-- Rule Form Modal -->
+            @if($editingRulePos !== null || (empty($rules) && !$editingRulePos))
+                <div class="bg-background-secondary border border-neutral/20 rounded-lg p-4 mb-4" x-data="{ showForm: true }" x-show="showForm">
+                    <div class="flex items-center justify-between mb-4">
+                        <h3 class="text-lg font-semibold">{{ $editingRulePos !== null ? 'Edit Rule' : 'Create New Rule' }}</h3>
+                        <button @click="showForm = false; $wire.resetRuleForm(); $wire.editingRulePos = null" class="text-base/50 hover:text-base">
+                            <x-ri-close-line class="size-5" />
+                        </button>
+                    </div>
+                    <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                        <div>
+                            <label class="block text-sm font-medium mb-2">Action</label>
+                            <select wire:model="ruleAction" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                                <option value="ACCEPT">Accept</option>
+                                <option value="REJECT">Reject</option>
+                                <option value="DROP">Drop</option>
+                            </select>
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium mb-2">Protocol</label>
+                            <select wire:model="ruleProto" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                                <option value="">Any</option>
+                                <option value="tcp">TCP</option>
+                                <option value="udp">UDP</option>
+                                <option value="icmp">ICMP</option>
+                                <option value="icmpv6">ICMPv6</option>
+                            </select>
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium mb-2">Source</label>
+                            <input type="text" wire:model="ruleSource" placeholder="e.g., 192.168.1.0/24" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium mb-2">Destination</label>
+                            <input type="text" wire:model="ruleDest" placeholder="e.g., 10.0.0.0/8" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium mb-2">Destination Port</label>
+                            <input type="text" wire:model="ruleDport" placeholder="e.g., 80,443 or 1000:2000" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium mb-2">Source Port</label>
+                            <input type="text" wire:model="ruleSport" placeholder="e.g., 8080" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium mb-2">Interface</label>
+                            <input type="text" wire:model="ruleIface" placeholder="e.g., net0" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium mb-2">Log Level</label>
+                            <select wire:model="ruleLog" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                                <option value="">No Logging</option>
+                                <option value="nolog">No Log</option>
+                                <option value="info">Info</option>
+                                <option value="warning">Warning</option>
+                                <option value="err">Error</option>
+                                <option value="crit">Critical</option>
+                                <option value="alert">Alert</option>
+                                <option value="emerg">Emergency</option>
+                            </select>
+                        </div>
+                        <div class="md:col-span-2">
+                            <label class="block text-sm font-medium mb-2">Comment</label>
+                            <input type="text" wire:model="ruleComment" placeholder="Optional description" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                        </div>
+                        <div class="md:col-span-2 flex items-center gap-2">
+                            <input type="checkbox" wire:model="ruleEnable" id="ruleEnable" class="rounded border-neutral">
+                            <label for="ruleEnable" class="text-sm">Enable this rule</label>
+                        </div>
+                    </div>
+                    <div class="flex gap-2 mt-4">
+                        <button 
+                            wire:click="saveRule"
+                            wire:loading.attr="disabled"
+                            class="px-4 py-2 bg-primary text-white rounded-lg hover:bg-primary/90 transition-colors text-sm font-medium">
+                            Save Rule
+                        </button>
+                        <button 
+                            @click="showForm = false; $wire.resetRuleForm(); $wire.editingRulePos = null"
+                            class="px-4 py-2 bg-background-secondary border border-neutral rounded-lg hover:bg-background transition-colors text-sm font-medium">
+                            Cancel
+                        </button>
+                    </div>
+                </div>
+            @endif
+
+            <!-- Rules Table -->
+            @if(count($rules) > 0)
+                <div class="overflow-x-auto">
+                    <table class="w-full border-collapse">
+                        <thead>
+                            <tr class="border-b border-neutral">
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Position</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Action</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Source</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Destination</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Protocol</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Port</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Status</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach($rules as $rule)
+                                <tr class="border-b border-neutral/20 hover:bg-background-secondary/50">
+                                    <td class="py-3 px-4 text-sm">{{ $rule['pos'] ?? '-' }}</td>
+                                    <td class="py-3 px-4 text-sm">
+                                        <span class="px-2 py-1 rounded text-xs font-medium
+                                            {{ ($rule['action'] ?? '') === 'ACCEPT' ? 'bg-success/20 text-success' : '' }}
+                                            {{ ($rule['action'] ?? '') === 'REJECT' ? 'bg-warning/20 text-warning' : '' }}
+                                            {{ ($rule['action'] ?? '') === 'DROP' ? 'bg-error/20 text-error' : '' }}">
+                                            {{ $rule['action'] ?? '-' }}
+                                        </span>
+                                    </td>
+                                    <td class="py-3 px-4 text-sm">{{ $rule['source'] ?? '-' }}</td>
+                                    <td class="py-3 px-4 text-sm">{{ $rule['dest'] ?? '-' }}</td>
+                                    <td class="py-3 px-4 text-sm">{{ strtoupper($rule['proto'] ?? 'any') }}</td>
+                                    <td class="py-3 px-4 text-sm">{{ $rule['dport'] ?? ($rule['sport'] ?? '-') }}</td>
+                                    <td class="py-3 px-4 text-sm">
+                                        @if(isset($rule['enable']) && $rule['enable'] == 0)
+                                            <span class="px-2 py-1 rounded text-xs font-medium bg-base/20 text-base/60">Disabled</span>
+                                        @else
+                                            <span class="px-2 py-1 rounded text-xs font-medium bg-success/20 text-success">Enabled</span>
+                                        @endif
+                                    </td>
+                                    <td class="py-3 px-4 text-sm">
+                                        <div class="flex gap-2">
+                                            <button 
+                                                wire:click="startEditRule({{ $rule['pos'] ?? 0 }})"
+                                                class="text-primary hover:text-primary/80 transition-colors">
+                                                <x-ri-edit-line class="size-4" />
+                                            </button>
+                                            <button 
+                                                wire:click="deleteRule({{ $rule['pos'] ?? 0 }})"
+                                                wire:confirm="Are you sure you want to delete this rule?"
+                                                class="text-error hover:text-error/80 transition-colors">
+                                                <x-ri-delete-bin-line class="size-4" />
+                                            </button>
+                                        </div>
+                                    </td>
+                                </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                </div>
+            @else
+                <div class="text-center py-8 text-base/60">
+                    <x-ri-list-check class="size-12 mx-auto mb-3 opacity-50" />
+                    <p>No firewall rules configured</p>
+                </div>
+            @endif
+        </div>
+
+        <!-- Aliases Card -->
+        <div class="bg-background border border-neutral rounded-lg p-6">
+            <div class="flex items-center justify-between mb-4">
+                <div class="flex items-center gap-3">
+                    <div class="flex items-center justify-center w-10 h-10 rounded-lg bg-primary/10">
+                        <x-ri-bookmark-line class="size-5 text-primary" />
+                    </div>
+                    <div>
+                        <h2 class="text-xl font-semibold">Aliases</h2>
+                        <p class="text-sm text-base/60 mt-1">Create named aliases for IP addresses and networks</p>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Create Alias Form -->
+            <div class="bg-background-secondary border border-neutral/20 rounded-lg p-4 mb-4">
+                <h3 class="text-lg font-semibold mb-4">Create New Alias</h3>
+                <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+                    <div>
+                        <label class="block text-sm font-medium mb-2">Name</label>
+                        <input type="text" wire:model="aliasName" placeholder="e.g., trusted-network" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium mb-2">CIDR</label>
+                        <input type="text" wire:model="aliasCidr" placeholder="e.g., 192.168.1.0/24" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium mb-2">Comment</label>
+                        <input type="text" wire:model="aliasComment" placeholder="Optional description" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                    </div>
+                </div>
+                <button 
+                    wire:click="createAlias"
+                    wire:loading.attr="disabled"
+                    class="mt-4 px-4 py-2 bg-primary text-white rounded-lg hover:bg-primary/90 transition-colors text-sm font-medium">
+                    Create Alias
+                </button>
+            </div>
+
+            <!-- Aliases Table -->
+            @if(count($aliases) > 0)
+                <div class="overflow-x-auto">
+                    <table class="w-full border-collapse">
+                        <thead>
+                            <tr class="border-b border-neutral">
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Name</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">CIDR</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Comment</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach($aliases as $alias)
+                                <tr class="border-b border-neutral/20 hover:bg-background-secondary/50">
+                                    <td class="py-3 px-4 text-sm font-medium">{{ $alias['name'] ?? '-' }}</td>
+                                    <td class="py-3 px-4 text-sm"><code>{{ $alias['cidr'] ?? '-' }}</code></td>
+                                    <td class="py-3 px-4 text-sm">{{ $alias['comment'] ?? '-' }}</td>
+                                    <td class="py-3 px-4 text-sm">
+                                        <button 
+                                            wire:click="deleteAlias('{{ $alias['name'] ?? '' }}')"
+                                            wire:confirm="Are you sure you want to delete this alias?"
+                                            class="text-error hover:text-error/80 transition-colors">
+                                            <x-ri-delete-bin-line class="size-4" />
+                                        </button>
+                                    </td>
+                                </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                </div>
+            @else
+                <div class="text-center py-8 text-base/60">
+                    <x-ri-bookmark-line class="size-12 mx-auto mb-3 opacity-50" />
+                    <p>No aliases configured</p>
+                </div>
+            @endif
+        </div>
+
+        <!-- IP Sets Card -->
+        <div class="bg-background border border-neutral rounded-lg p-6">
+            <div class="flex items-center justify-between mb-4">
+                <div class="flex items-center gap-3">
+                    <div class="flex items-center justify-center w-10 h-10 rounded-lg bg-primary/10">
+                        <x-ri-stack-line class="size-5 text-primary" />
+                    </div>
+                    <div>
+                        <h2 class="text-xl font-semibold">IP Sets</h2>
+                        <p class="text-sm text-base/60 mt-1">Manage sets of IP addresses for use in firewall rules</p>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Create IP Set Form -->
+            <div class="bg-background-secondary border border-neutral/20 rounded-lg p-4 mb-4">
+                <h3 class="text-lg font-semibold mb-4">Create New IP Set</h3>
+                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                    <div>
+                        <label class="block text-sm font-medium mb-2">Name</label>
+                        <input type="text" wire:model="ipsetName" placeholder="e.g., blocked-ips" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium mb-2">Comment</label>
+                        <input type="text" wire:model="ipsetComment" placeholder="Optional description" class="w-full px-3 py-2 border border-neutral rounded-lg bg-background">
+                    </div>
+                </div>
+                <button 
+                    wire:click="createIpset"
+                    wire:loading.attr="disabled"
+                    class="mt-4 px-4 py-2 bg-primary text-white rounded-lg hover:bg-primary/90 transition-colors text-sm font-medium">
+                    Create IP Set
+                </button>
+            </div>
+
+            <!-- IP Sets Table -->
+            @if(count($ipsets) > 0)
+                <div class="overflow-x-auto">
+                    <table class="w-full border-collapse">
+                        <thead>
+                            <tr class="border-b border-neutral">
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Name</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Comment</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach($ipsets as $ipset)
+                                <tr class="border-b border-neutral/20 hover:bg-background-secondary/50">
+                                    <td class="py-3 px-4 text-sm font-medium">{{ $ipset['name'] ?? '-' }}</td>
+                                    <td class="py-3 px-4 text-sm">{{ $ipset['comment'] ?? '-' }}</td>
+                                    <td class="py-3 px-4 text-sm">
+                                        <button 
+                                            wire:click="deleteIpset('{{ $ipset['name'] ?? '' }}')"
+                                            wire:confirm="Are you sure you want to delete this IP set?"
+                                            class="text-error hover:text-error/80 transition-colors">
+                                            <x-ri-delete-bin-line class="size-4" />
+                                        </button>
+                                    </td>
+                                </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                </div>
+            @else
+                <div class="text-center py-8 text-base/60">
+                    <x-ri-stack-line class="size-12 mx-auto mb-3 opacity-50" />
+                    <p>No IP sets configured</p>
+                </div>
+            @endif
+        </div>
+    @else
+        <div class="bg-background-secondary border border-neutral/20 rounded-lg p-8 text-center">
+            <x-ri-shield-line class="size-16 mx-auto mb-4 opacity-50" />
+            <h3 class="text-lg font-semibold mb-2">Firewall is Disabled</h3>
+            <p class="text-base/60">Enable the firewall above to manage rules, aliases, and IP sets.</p>
+        </div>
+    @endif
+</div>
+
+</x-proxmox::layout>
+
diff --git a/extensions/Servers/Proxmox/views/help.blade.php b/extensions/Servers/Proxmox/views/help.blade.php
index bfd430aba..7b99668ab 100644
--- a/extensions/Servers/Proxmox/views/help.blade.php
+++ b/extensions/Servers/Proxmox/views/help.blade.php
@@ -129,6 +129,13 @@
                                     <x-ri-restart-line class="size-4" />
                                     <span>Boot Settings</span>
                                 </button>
+                                <button @click="activeSection = 'firewall'" 
+                                        x-show="shouldShowSection('firewall', 'firewall rules allow block port access security', 'firewall rules allow block port access security')"
+                                        :class="activeSection === 'firewall' ? 'bg-background text-base font-semibold' : 'text-base/70 hover:text-base'"
+                                        class="w-full text-left px-3 py-2 rounded-md transition-colors flex items-center gap-2">
+                                    <x-ri-shield-line class="size-4" />
+                                    <span>Firewall</span>
+                                </button>
                                 <button @click="activeSection = 'network'" 
                                         x-show="shouldShowSection('network', 'network ip address mtu gateway routes firewall', 'network ip address mtu gateway routes firewall')"
                                         :class="activeSection === 'network' ? 'bg-background text-base font-semibold' : 'text-base/70 hover:text-base'"
@@ -1252,6 +1259,169 @@ preserve_hostname: false</code></pre>
 
                     <!-- I'll continue with a few more key sections to show the pattern, then you can see the full implementation -->
                     
+                    <!-- Firewall Section -->
+                    <div x-show="activeSection === 'firewall'" x-transition style="display: none;" data-section-id="firewall">
+                        <div class="flex items-center gap-3 mb-4">
+                            <div class="flex items-center justify-center w-10 h-10 rounded-lg bg-primary/10">
+                                <x-ri-shield-line class="size-5 text-primary" />
+                            </div>
+                            <h2 class="text-2xl font-bold">Firewall Tab</h2>
+                        </div>
+                        
+                        <p class="text-base/80 mb-6">
+                            The Firewall tab provides comprehensive firewall management for your virtual machine. You can enable or disable the firewall, create allow and block rules for network traffic, manage aliases for IP addresses and networks, and configure IP sets for advanced rule management.
+                        </p>
+
+                        <h3 class="text-xl font-semibold mt-6 mb-4 flex items-center gap-2">
+                            <x-ri-toggle-line class="size-5 text-base/60" />
+                            Firewall Status
+                        </h3>
+                        <div class="bg-background border border-neutral rounded-md p-4 mb-4">
+                            <p class="text-sm text-base/70 mb-3">
+                                The firewall can be enabled or disabled using the toggle switch at the top of the Firewall tab. When enabled, all configured firewall rules will be active and enforced. When disabled, all traffic will be allowed by default.
+                            </p>
+                            <ul class="list-disc list-inside text-sm text-base/70 space-y-1 ml-2">
+                                <li><strong>Enabled:</strong> All firewall rules are active and traffic is filtered according to your rules</li>
+                                <li><strong>Disabled:</strong> All traffic is allowed, firewall rules are ignored</li>
+                            </ul>
+                        </div>
+
+                        <h3 class="text-xl font-semibold mt-6 mb-4 flex items-center gap-2">
+                            <x-ri-list-check class="size-5 text-base/60" />
+                            Firewall Rules
+                        </h3>
+                        <div class="bg-background border border-neutral rounded-md p-4 mb-4">
+                            <p class="text-sm text-base/70 mb-3">
+                                Firewall rules control which network traffic is allowed or blocked. Rules are processed in order from top to bottom, and the first matching rule determines the action taken.
+                            </p>
+                            
+                            <h4 class="text-lg font-semibold mt-4 mb-2">Rule Actions</h4>
+                            <table class="w-full border border-neutral rounded-md mb-4">
+                                <thead>
+                                    <tr>
+                                        <th class="text-left py-2 px-3 font-semibold border-b border-neutral text-sm">Action</th>
+                                        <th class="text-left py-2 px-3 font-semibold border-b border-neutral text-sm">Description</th>
+                                    </tr>
+                                </thead>
+                                <tbody class="text-sm text-base/70">
+                                    <tr class="border-b border-neutral/20">
+                                        <td class="py-2 px-3 font-semibold">ACCEPT</td>
+                                        <td class="py-2 px-3">Allows the matching traffic to pass through</td>
+                                    </tr>
+                                    <tr class="border-b border-neutral/20">
+                                        <td class="py-2 px-3 font-semibold">REJECT</td>
+                                        <td class="py-2 px-3">Blocks the traffic and sends a rejection response to the sender</td>
+                                    </tr>
+                                    <tr>
+                                        <td class="py-2 px-3 font-semibold">DROP</td>
+                                        <td class="py-2 px-3">Silently blocks the traffic without sending a response</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+
+                            <h4 class="text-lg font-semibold mt-4 mb-2">Rule Parameters</h4>
+                            <ul class="list-disc list-inside text-sm text-base/70 space-y-2 ml-2">
+                                <li><strong>Source:</strong> IP address or network (CIDR notation) where traffic originates from (e.g., <code>192.168.1.0/24</code>)</li>
+                                <li><strong>Destination:</strong> IP address or network (CIDR notation) where traffic is going to</li>
+                                <li><strong>Protocol:</strong> Network protocol (TCP, UDP, ICMP, ICMPv6, or Any)</li>
+                                <li><strong>Destination Port:</strong> Port number or range (e.g., <code>80</code>, <code>443</code>, or <code>1000:2000</code>)</li>
+                                <li><strong>Source Port:</strong> Source port number or range</li>
+                                <li><strong>Interface:</strong> Network interface name (e.g., <code>net0</code>) to apply the rule to</li>
+                                <li><strong>Log Level:</strong> Optional logging level for matching traffic (info, warning, error, etc.)</li>
+                                <li><strong>Comment:</strong> Optional description for the rule</li>
+                            </ul>
+
+                            <h4 class="text-lg font-semibold mt-4 mb-2">Rule Order</h4>
+                            <p class="text-sm text-base/70 mb-2">
+                                Rules are processed in order from top to bottom. The first matching rule determines the action. It's important to place more specific rules before general ones. For example:
+                            </p>
+                            <ol class="list-decimal list-inside text-sm text-base/70 space-y-1 ml-2">
+                                <li>Allow specific IP addresses first</li>
+                                <li>Then allow specific port ranges</li>
+                                <li>Finally, block or reject all other traffic</li>
+                            </ol>
+                        </div>
+
+                        <h3 class="text-xl font-semibold mt-6 mb-4 flex items-center gap-2">
+                            <x-ri-bookmark-line class="size-5 text-base/60" />
+                            Aliases
+                        </h3>
+                        <div class="bg-background border border-neutral rounded-md p-4 mb-4">
+                            <p class="text-sm text-base/70 mb-3">
+                                Aliases allow you to create named references to IP addresses or networks. This makes firewall rules more readable and easier to maintain. Instead of typing IP addresses repeatedly, you can use an alias name.
+                            </p>
+                            <p class="text-sm text-base/70 mb-3">
+                                <strong>Example:</strong> Create an alias named <code>trusted-network</code> for <code>192.168.1.0/24</code>, then use <code>trusted-network</code> in your firewall rules instead of the full CIDR notation.
+                            </p>
+                            <ul class="list-disc list-inside text-sm text-base/70 space-y-1 ml-2">
+                                <li>Alias names must be unique</li>
+                                <li>CIDR notation is required (e.g., <code>192.168.1.0/24</code>)</li>
+                                <li>Aliases can be used in firewall rule source and destination fields</li>
+                            </ul>
+                        </div>
+
+                        <h3 class="text-xl font-semibold mt-6 mb-4 flex items-center gap-2">
+                            <x-ri-stack-line class="size-5 text-base/60" />
+                            IP Sets
+                        </h3>
+                        <div class="bg-background border border-neutral rounded-md p-4 mb-4">
+                            <p class="text-sm text-base/70 mb-3">
+                                IP sets are collections of IP addresses or networks that can be referenced in firewall rules. They are useful for managing large lists of IP addresses, such as blocked IPs or allowed IPs for specific services.
+                            </p>
+                            <p class="text-sm text-base/70 mb-3">
+                                <strong>Use Cases:</strong>
+                            </p>
+                            <ul class="list-disc list-inside text-sm text-base/70 space-y-1 ml-2">
+                                <li>Blocking multiple IP addresses from accessing your services</li>
+                                <li>Creating allow lists for specific applications</li>
+                                <li>Managing IP addresses that change frequently</li>
+                            </ul>
+                            <p class="text-sm text-base/70 mt-3">
+                                <strong>Note:</strong> After creating an IP set, you can add individual IP addresses or networks to it through the API. IP sets can then be referenced in firewall rules using the set name.
+                            </p>
+                        </div>
+
+                        <h3 class="text-xl font-semibold mt-6 mb-4 flex items-center gap-2">
+                            <x-ri-lightbulb-line class="size-5 text-base/60" />
+                            Best Practices
+                        </h3>
+                        <div class="bg-background border border-neutral rounded-md p-4 mb-4">
+                            <ul class="list-disc list-inside text-sm text-base/70 space-y-2 ml-2">
+                                <li><strong>Default Deny:</strong> Start with a default deny policy and explicitly allow only necessary traffic</li>
+                                <li><strong>Specific Rules First:</strong> Place more specific rules before general ones to ensure correct matching</li>
+                                <li><strong>Use Aliases:</strong> Use aliases for frequently referenced networks to improve readability and maintenance</li>
+                                <li><strong>Enable Logging:</strong> Enable logging on important rules to monitor traffic and troubleshoot issues</li>
+                                <li><strong>Test Rules:</strong> Test new rules carefully to avoid accidentally blocking legitimate traffic</li>
+                                <li><strong>Document Rules:</strong> Use comments to document the purpose of each rule</li>
+                                <li><strong>Regular Review:</strong> Periodically review and clean up unused rules, aliases, and IP sets</li>
+                            </ul>
+                        </div>
+
+                        <h3 class="text-xl font-semibold mt-6 mb-4 flex items-center gap-2">
+                            <x-ri-question-line class="size-5 text-base/60" />
+                            Common Scenarios
+                        </h3>
+                        <div class="bg-background border border-neutral rounded-md p-4 mb-4">
+                            <h4 class="text-lg font-semibold mt-2 mb-2">Allow SSH from Specific IP</h4>
+                            <pre class="bg-background-secondary p-3 rounded text-xs overflow-x-auto mb-3"><code>Action: ACCEPT
+Source: 192.168.1.100
+Protocol: TCP
+Destination Port: 22
+Comment: Allow SSH from office</code></pre>
+
+                            <h4 class="text-lg font-semibold mt-4 mb-2">Block All Traffic from a Network</h4>
+                            <pre class="bg-background-secondary p-3 rounded text-xs overflow-x-auto mb-3"><code>Action: DROP
+Source: 10.0.0.0/8
+Comment: Block private network range</code></pre>
+
+                            <h4 class="text-lg font-semibold mt-4 mb-2">Allow Web Traffic on Ports 80 and 443</h4>
+                            <pre class="bg-background-secondary p-3 rounded text-xs overflow-x-auto mb-3"><code>Action: ACCEPT
+Protocol: TCP
+Destination Port: 80,443
+Comment: Allow HTTP and HTTPS</code></pre>
+                        </div>
+                    </div>
+
                     <!-- Network Section with Tables -->
                     <div x-show="activeSection === 'network'" x-transition style="display: none;" data-section-id="network">
                         <div class="flex items-center gap-3 mb-4">