diff --git a/.env.e2e.example b/.env.e2e.example
index 602a0fdd..159a789d 100644
--- a/.env.e2e.example
+++ b/.env.e2e.example
@@ -4,3 +4,4 @@
 NFSE_E2E_BASE_URL="http://localhost:8082"
 NFSE_E2E_EMAIL=""
 NFSE_E2E_PASSWORD=""
+NFSE_E2E_REAL_EMIT_FLOW="0"
diff --git a/.gitignore b/.gitignore
index 1fedc203..b885ff3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /node_modules/
 /playwright-report/
 /test-results/
+.env.e2e
diff --git a/Database/Migrations/2026_03_29_000001_add_codigo_tributacao_nacional_to_nfse_company_services_table.php b/Database/Migrations/2026_03_29_000001_add_codigo_tributacao_nacional_to_nfse_company_services_table.php
new file mode 100644
index 00000000..73119102
--- /dev/null
+++ b/Database/Migrations/2026_03_29_000001_add_codigo_tributacao_nacional_to_nfse_company_services_table.php
@@ -0,0 +1,44 @@
+<?php
+
+// SPDX-FileCopyrightText: 2026 LibreCode coop and contributors
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class () extends Migration {
+    public function up(): void
+    {
+        if (!Schema::hasTable('nfse_company_services')) {
+            return;
+        }
+
+        if (Schema::hasColumn('nfse_company_services', 'codigo_tributacao_nacional')) {
+            return;
+        }
+
+        Schema::table('nfse_company_services', function (Blueprint $table): void {
+            $table->string('codigo_tributacao_nacional', 6)
+                ->nullable()
+                ->after('item_lista_servico');
+        });
+    }
+
+    public function down(): void
+    {
+        if (!Schema::hasTable('nfse_company_services')) {
+            return;
+        }
+
+        if (!Schema::hasColumn('nfse_company_services', 'codigo_tributacao_nacional')) {
+            return;
+        }
+
+        Schema::table('nfse_company_services', function (Blueprint $table): void {
+            $table->dropColumn('codigo_tributacao_nacional');
+        });
+    }
+};
diff --git a/Http/Controllers/CompanyServiceController.php b/Http/Controllers/CompanyServiceController.php
index da9d6364..6b2e39a6 100644
--- a/Http/Controllers/CompanyServiceController.php
+++ b/Http/Controllers/CompanyServiceController.php
@@ -119,10 +119,6 @@ public function update(Request $request, CompanyService $service): RedirectRespo
 
         $service->update($validated);
 
-        if ($service->is_default) {
-            $this->syncDefaultServiceSettings($service);
-        }
-
         return redirect()->route('nfse.settings.edit', ['tab' => 'services'])
             ->with('success', trans('nfse::general.settings.services.service_updated'));
     }
@@ -244,18 +240,5 @@ private function setDefaultService(CompanyService $service): void
             ->update(['is_default' => false]);
 
         $service->update(['is_default' => true]);
-
-        $this->syncDefaultServiceSettings($service);
-    }
-
-    private function syncDefaultServiceSettings(CompanyService $service): void
-    {
-        setting([
-            'nfse.item_lista_servico' => (string) $service->item_lista_servico,
-            'nfse.codigo_tributacao_nacional' => (string) $service->codigo_tributacao_nacional,
-            'nfse.aliquota' => number_format((float) $service->aliquota, 2, '.', ''),
-        ]);
-
-        setting()->save();
     }
 }
diff --git a/Http/Controllers/InvoiceController.php b/Http/Controllers/InvoiceController.php
index 027b3f97..1cc06bb6 100644
--- a/Http/Controllers/InvoiceController.php
+++ b/Http/Controllers/InvoiceController.php
@@ -21,6 +21,7 @@
 use LibreCodeCoop\NfsePHP\Exception\SecretStoreException;
 use LibreCodeCoop\NfsePHP\Http\NfseClient;
 use LibreCodeCoop\NfsePHP\SecretStore\OpenBaoSecretStore;
+use Modules\Nfse\Models\CompanyService;
 use Modules\Nfse\Models\NfseReceipt;
 use Modules\Nfse\Support\VaultConfig;
 
@@ -66,6 +67,7 @@ public function show(Invoice $invoice): \Illuminate\View\View
     public function emit(Invoice $invoice): RedirectResponse
     {
         $this->ensureInvoiceRelationsLoaded($invoice);
+        $defaultService = $this->resolveDefaultCompanyService($invoice);
 
         $readiness = $this->emissionReadiness();
 
@@ -79,19 +81,34 @@ public function emit(Invoice $invoice): RedirectResponse
         $sandbox = (bool) setting('nfse.sandbox_mode', true);
         $tomadorDocument = $this->normalizedTomadorDocument($invoice->contact?->tax_number);
         $opcaoSimplesNacional = $this->normalizedOpcaoSimplesNacional();
+        $federalPayload = $this->federalPayloadValues((float) $invoice->amount);
 
         $dps = new DpsData(
             cnpjPrestador:    $cnpj,
             municipioIbge:    $ibge,
-            itemListaServico: setting('nfse.item_lista_servico', '0107'),
-            codigoTributacaoNacional: $this->nationalTaxCode(),
+            itemListaServico: $this->itemListaServico($defaultService),
+            codigoTributacaoNacional: $this->nationalTaxCode($defaultService),
             valorServico:     number_format((float) $invoice->amount, 2, '.', ''),
-            aliquota:         $this->normalizedAliquota(),
+            aliquota:         $this->normalizedAliquota($defaultService),
             discriminacao:    $this->buildDiscriminacao($invoice),
             documentoTomador: $tomadorDocument,
             nomeTomador:      $invoice->contact?->name ?? '',
             opcaoSimplesNacional: $opcaoSimplesNacional,
             tipoAmbiente:     $sandbox ? 2 : 1,
+            serie:            $this->dpsSerie($invoice),
+            numeroDps:        $this->dpsNumber($invoice),
+            dataCompetencia:  $this->competenceDate($invoice),
+            indicadorTributacao: $federalPayload['indicadorTributacao'],
+            federalPiscofinsSituacaoTributaria: $federalPayload['federalPiscofinsSituacaoTributaria'],
+            federalPiscofinsTipoRetencao: $federalPayload['federalPiscofinsTipoRetencao'],
+            federalPiscofinsBaseCalculo: $federalPayload['federalPiscofinsBaseCalculo'],
+            federalPiscofinsAliquotaPis: $federalPayload['federalPiscofinsAliquotaPis'],
+            federalPiscofinsValorPis: $federalPayload['federalPiscofinsValorPis'],
+            federalPiscofinsAliquotaCofins: $federalPayload['federalPiscofinsAliquotaCofins'],
+            federalPiscofinsValorCofins: $federalPayload['federalPiscofinsValorCofins'],
+            federalValorIrrf: $federalPayload['federalValorIrrf'],
+            federalValorCsll: $federalPayload['federalValorCsll'],
+            federalValorCp: $federalPayload['federalValorCp'],
         );
 
         $this->safeLogInfo('NFS-e emission payload', [
@@ -221,6 +238,7 @@ public function refreshAll(): RedirectResponse
     public function reemit(Invoice $invoice): RedirectResponse
     {
         $this->ensureInvoiceRelationsLoaded($invoice);
+        $defaultService = $this->resolveDefaultCompanyService($invoice);
 
         $receipt = $this->findReceiptForInvoice($invoice);
 
@@ -239,19 +257,34 @@ public function reemit(Invoice $invoice): RedirectResponse
         $sandboxReemit = (bool) setting('nfse.sandbox_mode', true);
         $tomadorDocument = $this->normalizedTomadorDocument($invoice->contact?->tax_number);
         $opcaoSimplesNacional = $this->normalizedOpcaoSimplesNacional();
+        $federalPayload = $this->federalPayloadValues((float) $invoice->amount);
 
         $dps = new DpsData(
             cnpjPrestador: setting('nfse.cnpj_prestador'),
             municipioIbge: setting('nfse.municipio_ibge'),
-            itemListaServico: setting('nfse.item_lista_servico', '0107'),
-            codigoTributacaoNacional: $this->nationalTaxCode(),
+            itemListaServico: $this->itemListaServico($defaultService),
+            codigoTributacaoNacional: $this->nationalTaxCode($defaultService),
             valorServico: number_format((float) $invoice->amount, 2, '.', ''),
-            aliquota: $this->normalizedAliquota(),
+            aliquota: $this->normalizedAliquota($defaultService),
             discriminacao: $this->buildDiscriminacao($invoice),
             documentoTomador: $tomadorDocument,
             nomeTomador: $invoice->contact?->name ?? '',
             opcaoSimplesNacional: $opcaoSimplesNacional,
             tipoAmbiente: $sandboxReemit ? 2 : 1,
+            serie: $this->dpsSerie($invoice),
+            numeroDps: $this->dpsNumber($invoice),
+            dataCompetencia: $this->competenceDate($invoice),
+            indicadorTributacao: $federalPayload['indicadorTributacao'],
+            federalPiscofinsSituacaoTributaria: $federalPayload['federalPiscofinsSituacaoTributaria'],
+            federalPiscofinsTipoRetencao: $federalPayload['federalPiscofinsTipoRetencao'],
+            federalPiscofinsBaseCalculo: $federalPayload['federalPiscofinsBaseCalculo'],
+            federalPiscofinsAliquotaPis: $federalPayload['federalPiscofinsAliquotaPis'],
+            federalPiscofinsValorPis: $federalPayload['federalPiscofinsValorPis'],
+            federalPiscofinsAliquotaCofins: $federalPayload['federalPiscofinsAliquotaCofins'],
+            federalPiscofinsValorCofins: $federalPayload['federalPiscofinsValorCofins'],
+            federalValorIrrf: $federalPayload['federalValorIrrf'],
+            federalValorCsll: $federalPayload['federalValorCsll'],
+            federalValorCp: $federalPayload['federalValorCp'],
         );
 
         $client = $this->makeClient($sandboxReemit);
@@ -503,6 +536,7 @@ protected function emissionReadiness(): array
     {
         $settings = setting('nfse', []);
         $settings = is_array($settings) ? $settings : [];
+        $defaultService = $this->resolveDefaultCompanyService();
         $cnpj = (string) ($settings['cnpj_prestador'] ?? '');
         $certificatePath = $cnpj !== '' ? storage_path('app/nfse/pfx/' . $cnpj . '.pfx') : '';
         $transportCertificatePath = $this->projectRootPath('client.crt.pem');
@@ -511,7 +545,7 @@ protected function emissionReadiness(): array
         $checklist = [
             'cnpj_prestador' => $cnpj !== '',
             'municipio_ibge' => ((string) ($settings['municipio_ibge'] ?? '')) !== '',
-            'item_lista_servico' => ((string) ($settings['item_lista_servico'] ?? '')) !== '',
+            'item_lista_servico' => $this->itemListaServico($defaultService) !== '',
             'certificate' => $certificatePath !== '' && is_file($certificatePath),
             'certificate_secret' => $this->hasCertificateSecret($cnpj),
             'transport_certificate' => is_file($transportCertificatePath) && is_file($transportPrivateKeyPath),
@@ -523,27 +557,127 @@ protected function emissionReadiness(): array
         ];
     }
 
-    protected function nationalTaxCode(): string
+    protected function itemListaServico(?object $defaultService = null): string
     {
-        $configured = preg_replace('/\D+/', '', (string) setting('nfse.codigo_tributacao_nacional', '')) ?: '';
+        $serviceCode = preg_replace('/\D+/', '', (string) ($defaultService->item_lista_servico ?? '')) ?: '';
+
+        if ($serviceCode !== '') {
+            return substr($serviceCode, 0, 4);
+        }
+
+        return preg_replace('/\D+/', '', (string) setting('nfse.item_lista_servico', '0107')) ?: '0107';
+    }
+
+    protected function nationalTaxCode(?object $defaultService = null): string
+    {
+        $configured = preg_replace('/\D+/', '', (string) ($defaultService->codigo_tributacao_nacional ?? '')) ?: '';
+
+        if ($configured === '') {
+            $configured = preg_replace('/\D+/', '', (string) setting('nfse.codigo_tributacao_nacional', '')) ?: '';
+        }
 
         if ($configured !== '') {
             return str_pad(substr($configured, 0, 6), 6, '0', STR_PAD_LEFT);
         }
 
-        $lc116Code = preg_replace('/\D+/', '', (string) setting('nfse.item_lista_servico', '0107')) ?: '0107';
-
-        return str_pad(substr($lc116Code, 0, 4), 4, '0', STR_PAD_LEFT) . '01';
+        return '';
     }
 
-    protected function normalizedAliquota(): string
+    protected function normalizedAliquota(?object $defaultService = null): string
     {
-        $configured = (string) setting('nfse.aliquota', '5.00');
+        $configured = (string) ($defaultService->aliquota ?? '');
+
+        if ($configured === '') {
+            $configured = (string) setting('nfse.aliquota', '5.00');
+        }
+
         $normalized = str_replace(',', '.', trim($configured));
 
         return number_format((float) $normalized, 2, '.', '');
     }
 
+    protected function dpsSerie(Invoice $invoice): string
+    {
+        return '00001';
+    }
+
+    protected function dpsNumber(Invoice $invoice): string
+    {
+        $invoiceId = isset($invoice->id) ? (int) $invoice->id : 0;
+
+        return (string) max($invoiceId, 1);
+    }
+
+    protected function competenceDate(Invoice $invoice): ?string
+    {
+        $issuedAt = $invoice->issued_at ?? null;
+
+        if ($issuedAt instanceof \DateTimeInterface) {
+            return $issuedAt->format('Y-m-d');
+        }
+
+        if (is_string($issuedAt) && $issuedAt !== '') {
+            $timestamp = strtotime($issuedAt);
+
+            if ($timestamp !== false) {
+                return date('Y-m-d', $timestamp);
+            }
+        }
+
+        return null;
+    }
+
+    protected function resolveDefaultCompanyService(?Invoice $invoice = null): ?object
+    {
+        if (! $this->supportsCompanyServiceSelection()) {
+            return null;
+        }
+
+        $companyId = is_numeric($invoice?->company_id ?? null) ? (int) $invoice->company_id : $this->resolveCompanyId();
+
+        if ($companyId <= 0) {
+            return null;
+        }
+
+        return CompanyService::where('company_id', $companyId)
+            ->where('is_default', true)
+            ->where('is_active', true)
+            ->first();
+    }
+
+    protected function supportsCompanyServiceSelection(): bool
+    {
+        if (! class_exists(\Illuminate\Database\Eloquent\Model::class)) {
+            return false;
+        }
+
+        return class_exists(CompanyService::class)
+            && is_subclass_of(CompanyService::class, \Illuminate\Database\Eloquent\Model::class);
+    }
+
+    protected function resolveCompanyId(): int
+    {
+        if (function_exists('company_id')) {
+            $companyId = (int) (company_id() ?? 0);
+
+            if ($companyId > 0) {
+                return $companyId;
+            }
+        }
+
+        if (! function_exists('auth')) {
+            return 0;
+        }
+
+        try {
+            $user = auth()->user();
+        } catch (\Throwable) {
+            return 0;
+        }
+
+        return $user !== null && isset($user->company_id) ? (int) $user->company_id : 0;
+    }
+
     protected function normalizedOpcaoSimplesNacional(): int
     {
         $configured = (int) setting('nfse.opcao_simples_nacional', 2);
@@ -551,6 +685,101 @@ protected function normalizedOpcaoSimplesNacional(): int
         return in_array($configured, [1, 2], true) ? $configured : 2;
     }
 
+    protected function federalPayloadValues(float $invoiceAmount): array
+    {
+        $mode = (string) setting('nfse.tributacao_federal_mode', 'per_invoice_amounts');
+        $situacaoTributaria = $this->normalizedFederalSelectValue(setting('nfse.federal_piscofins_situacao_tributaria', ''));
+        $tipoRetencao = $this->normalizedFederalSelectValue(setting('nfse.federal_piscofins_tipo_retencao', ''));
+
+        $indicadorTributacao = (
+            setting('nfse.tributos_fed_p', '') !== '' ||
+            setting('nfse.tributos_est_p', '') !== '' ||
+            setting('nfse.tributos_mun_p', '') !== '' ||
+            setting('nfse.tributos_fed_sn', '') !== '' ||
+            setting('nfse.tributos_est_sn', '') !== '' ||
+            setting('nfse.tributos_mun_sn', '') !== ''
+        ) ? 2 : 0;
+
+        if ($situacaoTributaria === '' || $situacaoTributaria === '0') {
+            return [
+                'federalPiscofinsSituacaoTributaria' => '',
+                'federalPiscofinsTipoRetencao' => '',
+                'federalPiscofinsBaseCalculo' => '',
+                'federalPiscofinsAliquotaPis' => '',
+                'federalPiscofinsValorPis' => '',
+                'federalPiscofinsAliquotaCofins' => '',
+                'federalPiscofinsValorCofins' => '',
+                'federalValorIrrf' => $this->normalizedFederalDecimal(setting('nfse.federal_valor_irrf', '')),
+                'federalValorCsll' => '',
+                'federalValorCp' => $this->normalizedFederalDecimal(setting('nfse.federal_valor_cp', '')),
+                'indicadorTributacao' => $indicadorTributacao,
+            ];
+        }
+
+        $valorCsll = ($tipoRetencao !== '' && $tipoRetencao !== '0')
+            ? $this->normalizedFederalDecimal(setting('nfse.federal_valor_csll', ''))
+            : '';
+
+        if ($mode === 'percentage_profile') {
+            $aliquotaPis = $this->normalizedFederalDecimal(setting('nfse.federal_piscofins_aliquota_pis', ''));
+            $aliquotaCofins = $this->normalizedFederalDecimal(setting('nfse.federal_piscofins_aliquota_cofins', ''));
+
+            return [
+                'federalPiscofinsSituacaoTributaria' => $situacaoTributaria,
+                'federalPiscofinsTipoRetencao' => $tipoRetencao,
+                'federalPiscofinsBaseCalculo' => number_format($invoiceAmount, 2, '.', ''),
+                'federalPiscofinsAliquotaPis' => $aliquotaPis,
+                'federalPiscofinsValorPis' => $aliquotaPis !== ''
+                    ? number_format($invoiceAmount * (float) $aliquotaPis / 100, 2, '.', '')
+                    : '',
+                'federalPiscofinsAliquotaCofins' => $aliquotaCofins,
+                'federalPiscofinsValorCofins' => $aliquotaCofins !== ''
+                    ? number_format($invoiceAmount * (float) $aliquotaCofins / 100, 2, '.', '')
+                    : '',
+                'federalValorIrrf' => $this->normalizedFederalDecimal(setting('nfse.federal_valor_irrf', '')),
+                'federalValorCsll' => $valorCsll,
+                'federalValorCp' => $this->normalizedFederalDecimal(setting('nfse.federal_valor_cp', '')),
+                'indicadorTributacao' => $indicadorTributacao,
+            ];
+        }
+
+        return [
+            'federalPiscofinsSituacaoTributaria' => $situacaoTributaria,
+            'federalPiscofinsTipoRetencao' => $tipoRetencao,
+            'federalPiscofinsBaseCalculo' => $this->normalizedFederalDecimal(setting('nfse.federal_piscofins_base_calculo', '')),
+            'federalPiscofinsAliquotaPis' => $this->normalizedFederalDecimal(setting('nfse.federal_piscofins_aliquota_pis', '')),
+            'federalPiscofinsValorPis' => $this->normalizedFederalDecimal(setting('nfse.federal_piscofins_valor_pis', '')),
+            'federalPiscofinsAliquotaCofins' => $this->normalizedFederalDecimal(setting('nfse.federal_piscofins_aliquota_cofins', '')),
+            'federalPiscofinsValorCofins' => $this->normalizedFederalDecimal(setting('nfse.federal_piscofins_valor_cofins', '')),
+            'federalValorIrrf' => $this->normalizedFederalDecimal(setting('nfse.federal_valor_irrf', '')),
+            'federalValorCsll' => $valorCsll,
+            'federalValorCp' => $this->normalizedFederalDecimal(setting('nfse.federal_valor_cp', '')),
+            'indicadorTributacao' => $indicadorTributacao,
+        ];
+    }
+
+    protected function normalizedFederalSelectValue(mixed $value): string
+    {
+        $normalized = trim((string) $value);
+
+        return preg_match('/^\d+$/', $normalized) === 1 ? $normalized : '';
+    }
+
+    protected function normalizedFederalDecimal(mixed $value): string
+    {
+        if (!is_string($value) && !is_numeric($value)) {
+            return '';
+        }
+
+        $normalized = str_replace(',', '.', trim((string) $value));
+
+        if ($normalized === '' || !is_numeric($normalized)) {
+            return '';
+        }
+
+        return number_format((float) $normalized, 2, '.', '');
+    }
+
     protected function hasCertificateSecret(string $cnpj): bool
     {
         if ($cnpj === '') {
diff --git a/Http/Controllers/SettingsController.php b/Http/Controllers/SettingsController.php
index 92ed6ec3..a420a874 100644
--- a/Http/Controllers/SettingsController.php
+++ b/Http/Controllers/SettingsController.php
@@ -40,7 +40,7 @@ public function edit(?Request $request = null): \Illuminate\View\View
         $vaultUiState = $this->vaultUiState($settingsArray, $certificateState);
 
         $rawTab = $request !== null ? $request->query('tab') : null;
-        $activeTab = (is_string($rawTab) && in_array($rawTab, ['vault', 'certificate', 'fiscal', 'services'], true))
+        $activeTab = (is_string($rawTab) && in_array($rawTab, ['vault', 'certificate', 'fiscal', 'federal', 'services'], true))
             ? $rawTab
             : 'vault';
 
@@ -77,6 +77,7 @@ public function edit(?Request $request = null): \Illuminate\View\View
         }
 
         $companyServices = [];
+        $defaultCompanyService = null;
 
         if ($companyId > 0 && method_exists(CompanyService::class, 'query')) {
             $query = CompanyService::where('company_id', $companyId);
@@ -102,6 +103,13 @@ public function edit(?Request $request = null): \Illuminate\View\View
                 ->orderBy('is_default', 'desc')
                 ->orderBy('created_at')
                 ->get();
+
+            foreach ($companyServices as $companyService) {
+                if (($companyService->is_default ?? false) && ($companyService->is_active ?? true)) {
+                    $defaultCompanyService = $companyService;
+                    break;
+                }
+            }
         }
 
         return view('nfse::settings.edit', [
@@ -110,6 +118,7 @@ public function edit(?Request $request = null): \Illuminate\View\View
             'vaultUiState' => $vaultUiState,
             'activeTab' => $activeTab,
             'companyServices' => $companyServices,
+            'defaultCompanyService' => $defaultCompanyService,
             'servicesSearch' => $servicesSearch,
             'servicesStatus' => $servicesStatus,
         ]);
@@ -158,6 +167,7 @@ public function updateFiscal(Request $request): RedirectResponse
             'nfse.uf'                 => 'required|string|size:2',
             'nfse.municipio_nome'     => 'required|string|max:255',
             'nfse.municipio_ibge'     => 'required|string|size:7',
+            'nfse.opcao_simples_nacional' => 'nullable|in:1,2',
             'nfse.sandbox_mode'       => 'nullable|boolean',
         ]);
 
@@ -167,7 +177,7 @@ public function updateFiscal(Request $request): RedirectResponse
         $fiscalInput = $rawNfseInput;
         $fiscalInput['uf'] = strtoupper((string) ($fiscalInput['uf'] ?? ''));
 
-        foreach (['cnpj_prestador', 'uf', 'municipio_nome', 'municipio_ibge', 'sandbox_mode'] as $key) {
+        foreach (['cnpj_prestador', 'uf', 'municipio_nome', 'municipio_ibge', 'opcao_simples_nacional', 'sandbox_mode'] as $key) {
             if (array_key_exists($key, $fiscalInput)) {
                 setting(['nfse.' . $key => $fiscalInput[$key]]);
             }
@@ -179,6 +189,88 @@ public function updateFiscal(Request $request): RedirectResponse
             ->with('success', trans('nfse::general.saved'));
     }
 
+    public function updateFederal(Request $request): RedirectResponse
+    {
+        $settings = setting('nfse', []);
+        $settingsArray = is_array($settings) ? $settings : [];
+
+        if (!$this->isVaultReady($settingsArray)) {
+            return redirect()->route('nfse.settings.edit', ['tab' => 'vault'])
+                ->with('error', trans('nfse::general.vault_required_before_certificate_and_settings'));
+        }
+
+        $request->validate([
+            'nfse.tributacao_federal_mode' => 'required|in:per_invoice_amounts,percentage_profile',
+            'nfse.federal_piscofins_situacao_tributaria' => 'nullable|regex:/^\d+$/',
+            'nfse.federal_piscofins_tipo_retencao' => 'nullable|regex:/^\d+$/',
+            'nfse.federal_piscofins_base_calculo' => 'nullable|numeric|min:0',
+            'nfse.federal_piscofins_aliquota_pis' => 'nullable|numeric|min:0|max:100',
+            'nfse.federal_piscofins_valor_pis' => 'nullable|numeric|min:0',
+            'nfse.federal_piscofins_aliquota_cofins' => 'nullable|numeric|min:0|max:100',
+            'nfse.federal_piscofins_valor_cofins' => 'nullable|numeric|min:0',
+            'nfse.federal_valor_irrf' => 'nullable|numeric|min:0',
+            'nfse.federal_valor_csll' => 'nullable|numeric|min:0',
+            'nfse.federal_valor_cp' => 'nullable|numeric|min:0',
+            'nfse.tributos_fed_p' => 'nullable|numeric|min:0|max:100',
+            'nfse.tributos_est_p' => 'nullable|numeric|min:0|max:100',
+            'nfse.tributos_mun_p' => 'nullable|numeric|min:0|max:100',
+            'nfse.tributos_fed_sn' => 'nullable|numeric|min:0|max:100',
+            'nfse.tributos_est_sn' => 'nullable|numeric|min:0|max:100',
+            'nfse.tributos_mun_sn' => 'nullable|numeric|min:0|max:100',
+        ]);
+
+        $rawNfseInput = $request->input('nfse', []);
+        $rawNfseInput = is_array($rawNfseInput) ? $rawNfseInput : [];
+
+        $keys = [
+            'tributacao_federal_mode',
+            'federal_piscofins_situacao_tributaria',
+            'federal_piscofins_tipo_retencao',
+            'federal_piscofins_base_calculo',
+            'federal_piscofins_aliquota_pis',
+            'federal_piscofins_valor_pis',
+            'federal_piscofins_aliquota_cofins',
+            'federal_piscofins_valor_cofins',
+            'federal_valor_irrf',
+            'federal_valor_csll',
+            'federal_valor_cp',
+            'tributos_fed_p',
+            'tributos_est_p',
+            'tributos_mun_p',
+            'tributos_fed_sn',
+            'tributos_est_sn',
+            'tributos_mun_sn',
+        ];
+
+        foreach ($keys as $key) {
+            if (!array_key_exists($key, $rawNfseInput)) {
+                continue;
+            }
+
+            $value = $rawNfseInput[$key];
+
+            if (in_array($key, ['federal_piscofins_situacao_tributaria', 'federal_piscofins_tipo_retencao'], true)) {
+                $value = trim((string) $value);
+                $value = preg_match('/^\d+$/', $value) === 1 ? $value : null;
+            } elseif ($key !== 'tributacao_federal_mode') {
+                $value = is_string($value) ? str_replace(',', '.', trim($value)) : $value;
+
+                if ($value === '' || $value === null) {
+                    $value = null;
+                } elseif (is_numeric($value)) {
+                    $value = number_format((float) $value, 2, '.', '');
+                }
+            }
+
+            setting(['nfse.' . $key => $value]);
+        }
+
+        setting()->save();
+
+        return redirect()->route('nfse.settings.edit', ['tab' => 'federal'])
+            ->with('success', trans('nfse::general.saved'));
+    }
+
     public function ufs(IbgeLocalities $ibgeLocalities): JsonResponse
     {
         try {
@@ -289,8 +381,6 @@ public function update(Request $request): RedirectResponse
             'nfse.uf'              => 'required|string|size:2',
             'nfse.municipio_nome'  => 'required|string|max:255',
             'nfse.municipio_ibge'  => 'required|string|size:7',
-            'nfse.item_lista_servico' => 'required|string|size:4',
-            'nfse.codigo_tributacao_nacional' => 'nullable|string|size:6',
             'nfse.sandbox_mode'    => 'nullable|boolean',
             'nfse.bao_addr'        => 'required|url',
             'nfse.bao_mount'       => 'required|string',
diff --git a/Resources/lang/en-GB/general.php b/Resources/lang/en-GB/general.php
index d9f7ad48..c3e1930d 100644
--- a/Resources/lang/en-GB/general.php
+++ b/Resources/lang/en-GB/general.php
@@ -52,18 +52,19 @@
     'go_to_dashboard'       => 'Go to NFS-e dashboard',
     'go_to_invoices'        => 'Go to issued invoices',
     'go_to_pending_invoices' => 'Go to pending invoices',
-    'go_to_readiness'       => 'View operational readiness',
-    'go_to_settings'        => 'Go to settings',
+    'go_to_readiness'       => 'View settings',
+    'go_to_settings'        => 'View settings',
 
     'readiness' => [
-        'title' => 'NFS-e operational readiness',
-        'ready' => 'Environment ready for issuance',
-        'not_ready' => 'Environment is not ready yet',
-        'hint' => 'Complete the pending checks below to reduce issuance failures.',
+        'title' => 'NFS-e settings',
+        'ready' => 'Settings ready for issuance',
+        'not_ready' => 'Pending settings',
+        'hint' => 'Complete the pending items below to enable issuance.',
         'checks' => [
             'cnpj_prestador' => 'Service provider CNPJ saved',
             'municipio_ibge' => 'IBGE municipality configured',
             'item_lista_servico' => 'LC 116 service item configured',
+            'codigo_tributacao_nacional' => 'National tax code (NBS) configured',
             'bao_addr' => 'OpenBao address configured',
             'bao_mount' => 'OpenBao mount configured',
             'certificate' => 'Local certificate available',
@@ -97,8 +98,8 @@
         'issue_date' => 'Issue date',
         'back_to_list' => 'Back to list',
         'emit_now' => 'Emit NFS-e now',
-        'emit_blocked_not_ready' => 'Environment is not ready for issuance.',
-        'readiness_incomplete' => 'There are pending configuration checks. Resolve operational readiness before issuing.',
+        'emit_blocked_not_ready' => 'There are pending settings before issuance can continue.',
+        'readiness_incomplete' => 'There are pending configuration items. Review settings before issuing.',
         'no_pending' => 'No pending invoices to emit.',
         'cancel' => 'Cancel NFS-e',
         'refresh_status' => 'Refresh status',
@@ -132,6 +133,9 @@
         'uf'               => 'State (UF)',
         'municipio_nome'   => 'Municipality',
         'municipio_ibge'   => 'Municipality IBGE Code',
+        'opcao_simples_nacional' => 'Simples Nacional status',
+        'opcao_simples_nacional_not_optant' => 'Not opted into Simples Nacional',
+        'opcao_simples_nacional_optant' => 'Opted into Simples Nacional',
         'sandbox_mode'     => 'Sandbox Mode (Staging)',
         'vault_section_title' => '1. Vault server',
         'bao_addr'         => 'Vault server address',
@@ -174,9 +178,39 @@
         'codigo_tributacao_nacional' => 'National tax code (NBS)',
         'codigo_tributacao_nacional_hint' => 'Enter the 6-digit national service code. Example: 010701 for technical IT support.',
         'aliquota'         => 'ISS Rate (%)',
-        'services_config_moved_hint' => 'Service settings (LC116 item, national code and rate) are now managed exclusively in tab 4. Services.',
+        'services_config_moved_hint' => 'Service settings (LC116 item, national code and rate) are now managed exclusively in tab 5. Services.',
+        'current_default_service' => 'Current default service: :service',
+        'default_service_missing' => 'No active default service is configured. Choose a default service in tab 5. Services before issuing NFS-e.',
+        'manage_default_service' => 'Manage default service',
+        'federal' => [
+            'tab_title' => '4. Federal Taxation',
+            'heading' => 'Federal Taxation',
+            'helper' => 'Configure behavior and approximate federal, state and municipal tax percentages used for NFS-e issuance.',
+            'current_simples_status' => 'Current Simples Nacional status',
+            'behavior_label' => 'Fill behavior',
+            'behavior_hint' => 'The selected option is applied as the default for NFS-e issuances.',
+            'mode_per_invoice_amounts' => 'Fill monetary values for each issued NFS-e',
+            'mode_percentage_profile' => 'Configure the corresponding percentage values',
+            'select_placeholder' => 'Select...',
+            'piscofins_situacao_tributaria' => 'PIS/COFINS Tax Situation',
+            'piscofins_tipo_retencao' => 'PIS/COFINS/CSLL retention type',
+            'piscofins_base_calculo' => 'PIS/COFINS Tax Base',
+            'piscofins_aliquota_pis' => 'PIS - Rate',
+            'piscofins_valor_pis' => 'PIS - Own Assessment Debit',
+            'piscofins_aliquota_cofins' => 'COFINS - Rate',
+            'piscofins_valor_cofins' => 'COFINS - Own Assessment Debit',
+            'valor_irrf' => 'IRRF',
+            'valor_csll' => 'Social Contributions - Withheld',
+            'valor_cp' => 'Social Security Contribution - Withheld',
+            'tributos_fed_p' => 'Federal taxes (%) - Default profile',
+            'tributos_est_p' => 'State taxes (%) - Default profile',
+            'tributos_mun_p' => 'Municipal taxes (%) - Default profile',
+            'tributos_fed_sn' => 'Federal taxes (%) - Simples Nacional',
+            'tributos_est_sn' => 'State taxes (%) - Simples Nacional',
+            'tributos_mun_sn' => 'Municipal taxes (%) - Simples Nacional',
+        ],
         'services' => [
-            'tab_title' => '4. Services',
+            'tab_title' => '5. Services',
             'title' => 'Service Manager',
             'description' => 'Configure multiple services (LC 116) and rates for your company. Each service can be used when issuing NFS-e.',
             'lc116_code' => 'LC 116 Code',
diff --git a/Resources/lang/pt-BR/general.php b/Resources/lang/pt-BR/general.php
index d0ca4dea..24395f89 100644
--- a/Resources/lang/pt-BR/general.php
+++ b/Resources/lang/pt-BR/general.php
@@ -52,18 +52,19 @@
     'go_to_dashboard'       => 'Ir para o painel NFS-e',
     'go_to_invoices'        => 'Ir para notas emitidas',
     'go_to_pending_invoices' => 'Ir para faturas pendentes',
-    'go_to_readiness'       => 'Ver prontidão operacional',
-    'go_to_settings'        => 'Ir para configurações',
+    'go_to_readiness'       => 'Ver configurações',
+    'go_to_settings'        => 'Ver configurações',
 
     'readiness' => [
-        'title' => 'Prontidão operacional NFS-e',
-        'ready' => 'Ambiente pronto para emissão',
-        'not_ready' => 'Ambiente ainda não está pronto',
-        'hint' => 'Complete os itens pendentes abaixo para reduzir falhas de emissão.',
+        'title' => 'Configurações NFS-e',
+        'ready' => 'Configurações prontas para emissão',
+        'not_ready' => 'Configurações pendentes',
+        'hint' => 'Complete os itens pendentes abaixo para liberar a emissão.',
         'checks' => [
             'cnpj_prestador' => 'CNPJ do prestador salvo',
             'municipio_ibge' => 'Município IBGE configurado',
             'item_lista_servico' => 'Item da lista LC 116 configurado',
+            'codigo_tributacao_nacional' => 'Código de tributação nacional (NBS) configurado',
             'bao_addr' => 'Endereço OpenBao configurado',
             'bao_mount' => 'Mount OpenBao configurado',
             'certificate' => 'Certificado local disponível',
@@ -97,8 +98,8 @@
         'issue_date' => 'Data de emissão',
         'back_to_list' => 'Voltar para lista',
         'emit_now' => 'Emitir NFS-e agora',
-        'emit_blocked_not_ready' => 'Ambiente não está pronto para emissão.',
-        'readiness_incomplete' => 'Existem pendências de configuração. Resolva a prontidão operacional antes de emitir.',
+        'emit_blocked_not_ready' => 'Existem configurações pendentes para liberar a emissão.',
+        'readiness_incomplete' => 'Existem pendências de configuração. Revise as configurações antes de emitir.',
         'no_pending' => 'Nenhuma fatura pendente de emissão.',
         'cancel' => 'Cancelar NFS-e',
         'refresh_status' => 'Atualizar status',
@@ -132,6 +133,9 @@
         'uf'               => 'Estado (UF)',
         'municipio_nome'   => 'Município',
         'municipio_ibge'   => 'Código IBGE do Município',
+        'opcao_simples_nacional' => 'Situação no Simples Nacional',
+        'opcao_simples_nacional_not_optant' => 'Não optante',
+        'opcao_simples_nacional_optant' => 'Optante',
         'sandbox_mode'     => 'Modo Sandbox (Homologação)',
         'vault_section_title' => '1. Servidor Vault',
         'bao_addr'         => 'Endereço do servidor Vault',
@@ -174,9 +178,39 @@
         'codigo_tributacao_nacional' => 'Código de tributação nacional (NBS)',
         'codigo_tributacao_nacional_hint' => 'Opcional. Informe o código nacional de 6 dígitos apenas quando necessário para o seu cenário fiscal.',
         'aliquota'         => 'Alíquota ISS (%)',
-        'services_config_moved_hint' => 'Configurações de serviço (item LC116, código nacional e alíquota) agora são gerenciadas exclusivamente na aba 4. Serviços.',
+        'services_config_moved_hint' => 'Configurações de serviço (item LC116, código nacional e alíquota) agora são gerenciadas exclusivamente na aba 5. Serviços.',
+        'current_default_service' => 'Serviço padrão atual: :service',
+        'default_service_missing' => 'Nenhum serviço padrão ativo foi definido. Escolha um serviço padrão na aba 5. Serviços antes de emitir NFS-e.',
+        'manage_default_service' => 'Gerenciar serviço padrão',
+        'federal' => [
+            'tab_title' => '4. Tributação Federal',
+            'heading' => 'Tributação Federal',
+            'helper' => 'Configure o comportamento e os percentuais aproximados de tributos federais, estaduais e municipais para emissão da NFS-e.',
+            'current_simples_status' => 'Opção atual no Simples Nacional',
+            'behavior_label' => 'Comportamento de preenchimento',
+            'behavior_hint' => 'A opção selecionada será aplicada como padrão nas emissões de NFS-e.',
+            'mode_per_invoice_amounts' => 'Preencher os valores monetários em cada NFS-e emitida',
+            'mode_percentage_profile' => 'Configurar os valores percentuais correspondentes',
+            'select_placeholder' => 'Selecione...',
+            'piscofins_situacao_tributaria' => 'Situação Tributária do PIS/COFINS',
+            'piscofins_tipo_retencao' => 'Tipo de retenção do PIS/COFINS/CSLL',
+            'piscofins_base_calculo' => 'BC PIS/COFINS',
+            'piscofins_aliquota_pis' => 'PIS - Alíquota',
+            'piscofins_valor_pis' => 'PIS - Débito Apuração Própria',
+            'piscofins_aliquota_cofins' => 'COFINS - Alíquota',
+            'piscofins_valor_cofins' => 'COFINS - Débito Apuração Própria',
+            'valor_irrf' => 'IRRF',
+            'valor_csll' => 'Contribuições Sociais - Retidas',
+            'valor_cp' => 'Contribuição Previdenciária - Retida',
+            'tributos_fed_p' => 'Tributos federais (%) - Perfil padrão',
+            'tributos_est_p' => 'Tributos estaduais (%) - Perfil padrão',
+            'tributos_mun_p' => 'Tributos municipais (%) - Perfil padrão',
+            'tributos_fed_sn' => 'Tributos federais (%) - Simples Nacional',
+            'tributos_est_sn' => 'Tributos estaduais (%) - Simples Nacional',
+            'tributos_mun_sn' => 'Tributos municipais (%) - Simples Nacional',
+        ],
         'services' => [
-            'tab_title'       => '4. Serviços',
+            'tab_title'       => '5. Serviços',
             'title'           => 'Gerenciador de Serviços',
             'description'     => 'Configure múltiplos serviços (LC 116) e alíquotas para sua empresa. Cada serviço pode ser usado ao emitir uma NFS-e.',
             'lc116_code'      => 'Código LC 116',
diff --git a/Resources/views/invoices/pending.blade.php b/Resources/views/invoices/pending.blade.php
index 03d3bdf0..10ca70c1 100644
--- a/Resources/views/invoices/pending.blade.php
+++ b/Resources/views/invoices/pending.blade.php
@@ -35,8 +35,8 @@
                             @endforeach
                         </ul>
                     @endif
-                    <a href="{{ route('nfse.settings.edit', ['tab' => 'vault']) }}" class="underline mt-2 inline-block text-sm">
-                        {{ trans('nfse::general.go_to_readiness') }}
+                    <a href="{{ route('nfse.settings.edit', ['tab' => 'services']) }}" class="underline mt-2 inline-block text-sm">
+                        {{ trans('nfse::general.go_to_settings') }}
                     </a>
             </div>
         @endif
diff --git a/Resources/views/settings/edit.blade.php b/Resources/views/settings/edit.blade.php
index 4c023c11..dcee2e03 100644
--- a/Resources/views/settings/edit.blade.php
+++ b/Resources/views/settings/edit.blade.php
@@ -30,8 +30,17 @@
                     'vault'       => ['label' => trans('nfse::general.settings.vault_section_title'), 'enabled' => true],
                     'certificate' => ['label' => trans('nfse::general.step_certificate'),             'enabled' => $vaultReady],
                     'fiscal'      => ['label' => trans('nfse::general.step_settings'),                'enabled' => $hasSavedSettings],
+                    'federal'     => ['label' => trans('nfse::general.settings.federal.tab_title'),  'enabled' => $hasSavedSettings],
                     'services'    => ['label' => trans('nfse::general.settings.services.tab_title'), 'enabled' => $hasSavedSettings],
                 ];
+
+                $selectedFederalMode = old('nfse.tributacao_federal_mode', setting('nfse.tributacao_federal_mode', 'per_invoice_amounts'));
+                if (! in_array($selectedFederalMode, ['per_invoice_amounts', 'percentage_profile'], true)) {
+                    $selectedFederalMode = 'per_invoice_amounts';
+                }
+                $simplesStatus = (string) old('nfse.opcao_simples_nacional', setting('nfse.opcao_simples_nacional', 2)) === '1'
+                    ? trans('nfse::general.settings.opcao_simples_nacional_not_optant')
+                    : trans('nfse::general.settings.opcao_simples_nacional_optant');
             @endphp
 
             {{-- ── Tab navigation ──────────────────────────────────────── --}}
@@ -345,10 +354,11 @@ class="absolute inset-y-0 right-0 px-3 text-gray-500 hover:text-gray-700"
                         </div>
 
                         <div>
-                            <label class="block text-sm font-medium mb-1" for="item_lista_servico_display">{{ trans('nfse::general.settings.item_lista') }}</label>
-                            <input id="item_lista_servico_display" name="nfse[item_lista_servico_display]" type="text" list="lc116_services" class="w-full border rounded px-3 py-2" value="{{ old('nfse.item_lista_servico', setting('nfse.item_lista_servico', '0107')) }}">
-                            <input id="item_lista_servico" name="nfse[item_lista_servico]" type="hidden" value="{{ old('nfse.item_lista_servico', setting('nfse.item_lista_servico', '0107')) }}">
-                            <datalist id="lc116_services"></datalist>
+                            <label class="block text-sm font-medium mb-1" for="opcao_simples_nacional">{{ trans('nfse::general.settings.opcao_simples_nacional') }}</label>
+                            <select id="opcao_simples_nacional" name="nfse[opcao_simples_nacional]" class="w-full border rounded px-3 py-2">
+                                <option value="1" @selected((string) old('nfse.opcao_simples_nacional', setting('nfse.opcao_simples_nacional', 2)) === '1')>{{ trans('nfse::general.settings.opcao_simples_nacional_not_optant') }}</option>
+                                <option value="2" @selected((string) old('nfse.opcao_simples_nacional', setting('nfse.opcao_simples_nacional', 2)) === '2')>{{ trans('nfse::general.settings.opcao_simples_nacional_optant') }}</option>
+                            </select>
                         </div>
 
                         <label class="inline-flex items-center gap-2">
@@ -365,7 +375,187 @@ class="absolute inset-y-0 right-0 px-3 text-gray-500 hover:text-gray-700"
                 @endif
             </div>
 
-            {{-- ── Panel 4: Services ─────────────────────────────────────── --}}
+            {{-- ── Panel 4: Federal taxation ─────────────────────────────── --}}
+            <div id="tab-panel-federal" class="tab-panel @if($activeTab !== 'federal') hidden @endif">
+
+                @if(!$hasSavedSettings)
+                    <div class="bg-amber-50 border border-amber-300 text-amber-800 px-4 py-3 rounded">
+                        {{ trans('nfse::general.settings.vault_gate_locked_notice') }}
+                    </div>
+                @else
+                    <form method="POST" action="{{ route('nfse.settings.federal') }}" class="space-y-4">
+                        @csrf
+                        @method('PATCH')
+
+                        <h3 class="text-base font-semibold text-gray-900">{{ trans('nfse::general.settings.federal.heading') }}</h3>
+
+                        <p class="text-sm text-gray-600">{{ trans('nfse::general.settings.federal.helper') }}</p>
+
+                        <div>
+                            <label class="block text-sm font-medium mb-1" for="federal_opcao_simples_status">{{ trans('nfse::general.settings.federal.current_simples_status') }}</label>
+                            <input id="federal_opcao_simples_status" type="text" class="w-full border rounded px-3 py-2 bg-gray-50" value="{{ $simplesStatus }}" readonly>
+                        </div>
+
+                        <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                            <div>
+                                <label class="block text-sm font-medium mb-1" for="federal-piscofins-situacao">{{ trans('nfse::general.settings.federal.piscofins_situacao_tributaria') }}</label>
+                                <select id="federal-piscofins-situacao" name="nfse[federal_piscofins_situacao_tributaria]" class="w-full border rounded px-3 py-2">
+                                    <option value="">{{ trans('nfse::general.settings.federal.select_placeholder') }}</option>
+                                    <option value="0" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '0')>00 - Nenhum</option>
+                                    <option value="1" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '1')>01 - Operacao Tributavel com Aliquota Basica</option>
+                                    <option value="2" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '2')>02 - Operacao Tributavel com Aliquota Diferenciada</option>
+                                    <option value="3" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '3')>03 - Operacao Tributavel com Aliquota por Unidade de Medida de Produto</option>
+                                    <option value="4" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '4')>04 - Operacao Tributavel monofasica - Revenda a Aliquota Zero</option>
+                                    <option value="5" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '5')>05 - Operacao Tributavel por Substituicao Tributaria</option>
+                                    <option value="6" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '6')>06 - Operacao Tributavel a Aliquota Zero</option>
+                                    <option value="7" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '7')>07 - Operacao Isenta da Contribuicao</option>
+                                    <option value="8" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '8')>08 - Operacao sem Incidencia da Contribuicao</option>
+                                    <option value="9" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '9')>09 - Operacao com Suspensao da Contribuicao</option>
+                                    <option value="49" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '49')>49 - Outras Operacoes de Saida</option>
+                                    <option value="50" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '50')>50 - Operacao com Direito a Credito</option>
+                                    <option value="51" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '51')>51 - Operacao com Direito a Credito nao tributada</option>
+                                    <option value="52" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '52')>52 - Operacao com Direito a Credito para exportacao</option>
+                                    <option value="53" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '53')>53 - Credito para receitas tributadas e nao tributadas</option>
+                                    <option value="54" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '54')>54 - Credito para receitas internas e exportacao</option>
+                                    <option value="55" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '55')>55 - Credito para receitas nao tributadas e exportacao</option>
+                                    <option value="56" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '56')>56 - Credito para receitas mistas</option>
+                                    <option value="60" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '60')>60 - Credito Presumido</option>
+                                    <option value="61" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '61')>61 - Credito Presumido nao tributada</option>
+                                    <option value="62" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '62')>62 - Credito Presumido exportacao</option>
+                                    <option value="63" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '63')>63 - Credito Presumido receitas mistas internas</option>
+                                    <option value="64" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '64')>64 - Credito Presumido interno e exportacao</option>
+                                    <option value="65" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '65')>65 - Credito Presumido nao tributada e exportacao</option>
+                                    <option value="66" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '66')>66 - Credito Presumido receitas mistas</option>
+                                    <option value="67" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '67')>67 - Credito Presumido outras operacoes</option>
+                                    <option value="70" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '70')>70 - Operacao de Aquisicao sem Direito a Credito</option>
+                                    <option value="71" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '71')>71 - Operacao de Aquisicao com Isencao</option>
+                                    <option value="72" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '72')>72 - Operacao de Aquisicao com Suspensao</option>
+                                    <option value="73" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '73')>73 - Operacao de Aquisicao a Aliquota Zero</option>
+                                    <option value="74" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '74')>74 - Operacao de Aquisicao sem Incidencia</option>
+                                    <option value="75" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '75')>75 - Operacao de Aquisicao por Substituicao Tributaria</option>
+                                    <option value="98" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '98')>98 - Outras Operacoes de Entrada</option>
+                                    <option value="99" @selected((string) old('nfse.federal_piscofins_situacao_tributaria', setting('nfse.federal_piscofins_situacao_tributaria', '')) === '99')>99 - Outras Operacoes</option>
+                                </select>
+                            </div>
+
+                            <div>
+                                <label class="block text-sm font-medium mb-1" for="federal-piscofins-tipo-retencao">{{ trans('nfse::general.settings.federal.piscofins_tipo_retencao') }}</label>
+                                <select id="federal-piscofins-tipo-retencao" name="nfse[federal_piscofins_tipo_retencao]" class="w-full border rounded px-3 py-2">
+                                    <option value="">{{ trans('nfse::general.settings.federal.select_placeholder') }}</option>
+                                    <option value="0" @selected((string) old('nfse.federal_piscofins_tipo_retencao', setting('nfse.federal_piscofins_tipo_retencao', '')) === '0')>PIS/COFINS/CSLL Nao Retidos</option>
+                                    <option value="3" @selected((string) old('nfse.federal_piscofins_tipo_retencao', setting('nfse.federal_piscofins_tipo_retencao', '')) === '3')>PIS/COFINS/CSLL Retidos</option>
+                                    <option value="4" @selected((string) old('nfse.federal_piscofins_tipo_retencao', setting('nfse.federal_piscofins_tipo_retencao', '')) === '4')>PIS/COFINS Retidos, CSLL Nao Retido</option>
+                                    <option value="5" @selected((string) old('nfse.federal_piscofins_tipo_retencao', setting('nfse.federal_piscofins_tipo_retencao', '')) === '5')>PIS Retido, COFINS/CSLL Nao Retido</option>
+                                    <option value="6" @selected((string) old('nfse.federal_piscofins_tipo_retencao', setting('nfse.federal_piscofins_tipo_retencao', '')) === '6')>COFINS Retido, PIS/CSLL Nao Retido</option>
+                                    <option value="7" @selected((string) old('nfse.federal_piscofins_tipo_retencao', setting('nfse.federal_piscofins_tipo_retencao', '')) === '7')>PIS Nao Retido, COFINS/CSLL Retidos</option>
+                                    <option value="8" @selected((string) old('nfse.federal_piscofins_tipo_retencao', setting('nfse.federal_piscofins_tipo_retencao', '')) === '8')>PIS/COFINS Nao Retidos, CSLL Retido</option>
+                                    <option value="9" @selected((string) old('nfse.federal_piscofins_tipo_retencao', setting('nfse.federal_piscofins_tipo_retencao', '')) === '9')>COFINS Nao Retido, PIS/CSLL Retidos</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div id="federal-piscofins-panel" class="rounded-md border border-gray-200 p-3 space-y-4 hidden">
+                            <div id="federal-piscofins-bc-row">
+                                <label class="block text-sm font-medium mb-1" for="federal_piscofins_base_calculo">{{ trans('nfse::general.settings.federal.piscofins_base_calculo') }}</label>
+                                <input id="federal_piscofins_base_calculo" name="nfse[federal_piscofins_base_calculo]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2 federal-piscofins-field" value="{{ old('nfse.federal_piscofins_base_calculo', setting('nfse.federal_piscofins_base_calculo', '')) }}" placeholder="0.00">
+                            </div>
+
+                            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                                <div>
+                                    <label class="block text-sm font-medium mb-1" for="federal_piscofins_aliquota_pis">{{ trans('nfse::general.settings.federal.piscofins_aliquota_pis') }}</label>
+                                    <input id="federal_piscofins_aliquota_pis" name="nfse[federal_piscofins_aliquota_pis]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2 federal-piscofins-field" value="{{ old('nfse.federal_piscofins_aliquota_pis', setting('nfse.federal_piscofins_aliquota_pis', '')) }}" placeholder="0.00">
+                                </div>
+                                <div id="federal-piscofins-pis-valor-col">
+                                    <label class="block text-sm font-medium mb-1" for="federal_piscofins_valor_pis">{{ trans('nfse::general.settings.federal.piscofins_valor_pis') }}</label>
+                                    <input id="federal_piscofins_valor_pis" name="nfse[federal_piscofins_valor_pis]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2 federal-piscofins-field" value="{{ old('nfse.federal_piscofins_valor_pis', setting('nfse.federal_piscofins_valor_pis', '')) }}" placeholder="0.00">
+                                </div>
+                            </div>
+
+                            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                                <div>
+                                    <label class="block text-sm font-medium mb-1" for="federal_piscofins_aliquota_cofins">{{ trans('nfse::general.settings.federal.piscofins_aliquota_cofins') }}</label>
+                                    <input id="federal_piscofins_aliquota_cofins" name="nfse[federal_piscofins_aliquota_cofins]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2 federal-piscofins-field" value="{{ old('nfse.federal_piscofins_aliquota_cofins', setting('nfse.federal_piscofins_aliquota_cofins', '')) }}" placeholder="0.00">
+                                </div>
+                                <div id="federal-piscofins-cofins-valor-col">
+                                    <label class="block text-sm font-medium mb-1" for="federal_piscofins_valor_cofins">{{ trans('nfse::general.settings.federal.piscofins_valor_cofins') }}</label>
+                                    <input id="federal_piscofins_valor_cofins" name="nfse[federal_piscofins_valor_cofins]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2 federal-piscofins-field" value="{{ old('nfse.federal_piscofins_valor_cofins', setting('nfse.federal_piscofins_valor_cofins', '')) }}" placeholder="0.00">
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+                            <div>
+                                <label class="block text-sm font-medium mb-1" for="federal_valor_irrf">{{ trans('nfse::general.settings.federal.valor_irrf') }}</label>
+                                <input id="federal_valor_irrf" name="nfse[federal_valor_irrf]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2" value="{{ old('nfse.federal_valor_irrf', setting('nfse.federal_valor_irrf', '')) }}" placeholder="0.00">
+                            </div>
+                            <div>
+                                <label class="block text-sm font-medium mb-1" for="federal_valor_csll">{{ trans('nfse::general.settings.federal.valor_csll') }}</label>
+                                <input id="federal_valor_csll" name="nfse[federal_valor_csll]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2" value="{{ old('nfse.federal_valor_csll', setting('nfse.federal_valor_csll', '')) }}" placeholder="0.00">
+                            </div>
+                            <div>
+                                <label class="block text-sm font-medium mb-1" for="federal_valor_cp">{{ trans('nfse::general.settings.federal.valor_cp') }}</label>
+                                <input id="federal_valor_cp" name="nfse[federal_valor_cp]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2" value="{{ old('nfse.federal_valor_cp', setting('nfse.federal_valor_cp', '')) }}" placeholder="0.00">
+                            </div>
+                        </div>
+
+                        <fieldset class="rounded-md border border-gray-200 p-3 space-y-2">
+                            <legend class="px-1 text-sm font-semibold">{{ trans('nfse::general.settings.federal.behavior_label') }}</legend>
+                            <p class="text-xs text-gray-500">{{ trans('nfse::general.settings.federal.behavior_hint') }}</p>
+
+                            <div class="space-y-2 pt-1">
+                                <label class="inline-flex items-center gap-2 cursor-pointer font-medium text-sm">
+                                    <input type="radio" name="nfse[tributacao_federal_mode]" value="per_invoice_amounts" @checked($selectedFederalMode === 'per_invoice_amounts')>
+                                    {{ trans('nfse::general.settings.federal.mode_per_invoice_amounts') }}
+                                </label>
+                                <label class="inline-flex items-center gap-2 cursor-pointer font-medium text-sm">
+                                    <input type="radio" name="nfse[tributacao_federal_mode]" value="percentage_profile" @checked($selectedFederalMode === 'percentage_profile')>
+                                    {{ trans('nfse::general.settings.federal.mode_percentage_profile') }}
+                                </label>
+                            </div>
+                        </fieldset>
+
+                        <div id="federal-tributos-percent-rows" class="space-y-4">
+                            <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+                                <div>
+                                    <label class="block text-sm font-medium mb-1" for="tributos_fed_p">{{ trans('nfse::general.settings.federal.tributos_fed_p') }}</label>
+                                    <input id="tributos_fed_p" name="nfse[tributos_fed_p]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2" value="{{ old('nfse.tributos_fed_p', setting('nfse.tributos_fed_p', '')) }}" placeholder="0.00">
+                                </div>
+                                <div>
+                                    <label class="block text-sm font-medium mb-1" for="tributos_est_p">{{ trans('nfse::general.settings.federal.tributos_est_p') }}</label>
+                                    <input id="tributos_est_p" name="nfse[tributos_est_p]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2" value="{{ old('nfse.tributos_est_p', setting('nfse.tributos_est_p', '')) }}" placeholder="0.00">
+                                </div>
+                                <div>
+                                    <label class="block text-sm font-medium mb-1" for="tributos_mun_p">{{ trans('nfse::general.settings.federal.tributos_mun_p') }}</label>
+                                    <input id="tributos_mun_p" name="nfse[tributos_mun_p]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2" value="{{ old('nfse.tributos_mun_p', setting('nfse.tributos_mun_p', '')) }}" placeholder="0.00">
+                                </div>
+                            </div>
+
+                            <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+                                <div>
+                                    <label class="block text-sm font-medium mb-1" for="tributos_fed_sn">{{ trans('nfse::general.settings.federal.tributos_fed_sn') }}</label>
+                                    <input id="tributos_fed_sn" name="nfse[tributos_fed_sn]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2" value="{{ old('nfse.tributos_fed_sn', setting('nfse.tributos_fed_sn', '')) }}" placeholder="0.00">
+                                </div>
+                                <div>
+                                    <label class="block text-sm font-medium mb-1" for="tributos_est_sn">{{ trans('nfse::general.settings.federal.tributos_est_sn') }}</label>
+                                    <input id="tributos_est_sn" name="nfse[tributos_est_sn]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2" value="{{ old('nfse.tributos_est_sn', setting('nfse.tributos_est_sn', '')) }}" placeholder="0.00">
+                                </div>
+                                <div>
+                                    <label class="block text-sm font-medium mb-1" for="tributos_mun_sn">{{ trans('nfse::general.settings.federal.tributos_mun_sn') }}</label>
+                                    <input id="tributos_mun_sn" name="nfse[tributos_mun_sn]" type="text" inputmode="decimal" class="w-full border rounded px-3 py-2" value="{{ old('nfse.tributos_mun_sn', setting('nfse.tributos_mun_sn', '')) }}" placeholder="0.00">
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="flex justify-end pt-2">
+                            <button type="submit" class="inline-flex items-center px-4 py-2 rounded bg-green-600 text-white hover:bg-green-700">
+                                {{ trans('general.save') }}
+                            </button>
+                        </div>
+                    </form>
+                @endif
+            </div>
+
+            {{-- ── Panel 5: Services ─────────────────────────────────────── --}}
             <div id="tab-panel-services" class="tab-panel @if($activeTab !== 'services') hidden @endif">
 
                 @if(!$hasSavedSettings)
@@ -528,16 +718,120 @@ class="absolute inset-y-0 right-0 px-3 text-gray-500 hover:text-gray-700"
                     }
                 });
 
+                // ── Federal tab: official-like PIS/COFINS interactions ────
+                const federalSituacao = document.getElementById('federal-piscofins-situacao');
+                const federalTipoRetencao = document.getElementById('federal-piscofins-tipo-retencao');
+                const federalPanel = document.getElementById('federal-piscofins-panel');
+                const federalCsll = document.getElementById('federal_valor_csll');
+                const federalFields = Array.from(document.querySelectorAll('.federal-piscofins-field'));
+
+                const blockPiscofinsFields = (blockAndZero) => {
+                    federalFields.forEach((field) => {
+                        if (!(field instanceof HTMLInputElement)) {
+                            return;
+                        }
+
+                        if (blockAndZero) {
+                            field.value = '0.00';
+                            field.readOnly = true;
+                            field.classList.add('bg-gray-50');
+                        } else {
+                            if (field.value === '0.00') {
+                                field.value = '';
+                            }
+                            field.readOnly = false;
+                            field.classList.remove('bg-gray-50');
+                        }
+                    });
+                };
+
+                const syncFederalPanel = () => {
+                    if (!(federalSituacao instanceof HTMLSelectElement)) {
+                        return;
+                    }
+
+                    const situacao = federalSituacao.value;
+                    const showPiscofins = situacao !== '' && situacao !== '0';
+
+                    if (federalPanel) {
+                        federalPanel.classList.toggle('hidden', !showPiscofins);
+                    }
+
+                    if (!showPiscofins) {
+                        if (federalTipoRetencao instanceof HTMLSelectElement) {
+                            federalTipoRetencao.value = '';
+                        }
+
+                        federalFields.forEach((field) => {
+                            if (field instanceof HTMLInputElement) {
+                                field.value = '';
+                                field.readOnly = false;
+                                field.classList.remove('bg-gray-50');
+                            }
+                        });
+                    }
+
+                    blockPiscofinsFields(situacao === '4' || situacao === '6');
+                };
+
+                const syncFederalRetencao = () => {
+                    if (!(federalTipoRetencao instanceof HTMLSelectElement) || !(federalCsll instanceof HTMLInputElement)) {
+                        return;
+                    }
+
+                    const hasCsllRetention = federalTipoRetencao.value !== '' && federalTipoRetencao.value !== '0';
+
+                    federalCsll.readOnly = !hasCsllRetention;
+                    federalCsll.classList.toggle('bg-gray-50', !hasCsllRetention);
+
+                    if (!hasCsllRetention) {
+                        federalCsll.value = '';
+                    }
+                };
+
+                federalSituacao?.addEventListener('change', () => {
+                    syncFederalPanel();
+                    syncFederalRetencao();
+                });
+
+                federalTipoRetencao?.addEventListener('change', () => {
+                    syncFederalRetencao();
+                });
+
+                syncFederalPanel();
+                syncFederalRetencao();
+
+                // ── Federal mode toggle: per_invoice_amounts ↔ percentage_profile ──
+                const federalModeRadios = document.querySelectorAll('input[name="nfse[tributacao_federal_mode]"]');
+                const federalBcRow = document.getElementById('federal-piscofins-bc-row');
+                const federalPisValorCol = document.getElementById('federal-piscofins-pis-valor-col');
+                const federalCofinsValorCol = document.getElementById('federal-piscofins-cofins-valor-col');
+                const tributosPercentRows = document.getElementById('federal-tributos-percent-rows');
+
+                const syncFederalMode = () => {
+                    const mode = document.querySelector('input[name="nfse[tributacao_federal_mode]"]:checked')?.value ?? 'per_invoice_amounts';
+                    const isPercentage = mode === 'percentage_profile';
+
+                    // In percentage_profile mode: BC and valor fields are auto-calculated at emission time
+                    federalBcRow?.classList.toggle('hidden', isPercentage);
+                    federalPisValorCol?.classList.toggle('hidden', isPercentage);
+                    federalCofinsValorCol?.classList.toggle('hidden', isPercentage);
+
+                    // Percentage profile rows only relevant in percentage_profile mode
+                    tributosPercentRows?.classList.toggle('hidden', !isPercentage);
+                };
+
+                federalModeRadios.forEach((radio) => {
+                    radio.addEventListener('change', syncFederalMode);
+                });
+
+                syncFederalMode();
+
                 // ── Fiscal tab: UF / municipality / LC116 ───────────────────
                 const ufSelect           = document.getElementById('uf');
                 const municipalitySelect = document.getElementById('municipio_nome');
                 const ibgeHidden         = document.getElementById('municipio_ibge');
                 const ibgeDisplay        = document.getElementById('municipio_ibge_display');
-                const lc116DisplayInput  = document.getElementById('item_lista_servico_display');
-                const lc116CodeInput     = document.getElementById('item_lista_servico');
-                const lc116Datalist      = document.getElementById('lc116_services');
-                const hasLc116Autocomplete = Boolean(lc116DisplayInput && lc116CodeInput && lc116Datalist);
-
                 if (!ufSelect) {
                     return; // fiscal tab not rendered (no saved settings)
                 }
@@ -545,14 +839,9 @@ class="absolute inset-y-0 right-0 px-3 text-gray-500 hover:text-gray-700"
                 const selectedUf              = @json(old('nfse.uf', setting('nfse.uf', '')));
                 const selectedMunicipalityName = @json(old('nfse.municipio_nome', setting('nfse.municipio_nome', '')));
                 const selectedIbge            = @json(old('nfse.municipio_ibge', setting('nfse.municipio_ibge', '')));
-                const selectedLc116Code       = @json(old('nfse.item_lista_servico', setting('nfse.item_lista_servico', '0107')));
 
                 const ufsUrl                   = @json(route('nfse.ibge.ufs'));
                 const municipalitiesUrlTemplate = @json(route('nfse.ibge.municipalities', ['uf' => '__UF__']));
-                const lc116ServicesUrl         = @json(route('nfse.lc116.services'));
-
-                const lc116ByLabel = new Map();
-                const lc116ByCode  = new Map();
 
                 const fetchJson = async (url) => {
                     const response = await fetch(url, { headers: { Accept: 'application/json' } });
@@ -561,21 +850,6 @@ class="absolute inset-y-0 right-0 px-3 text-gray-500 hover:text-gray-700"
                     return Array.isArray(payload.data) ? payload.data : [];
                 };
 
-                const renderLc116Options = (services) => {
-                    if (!hasLc116Autocomplete) {
-                        return;
-                    }
-
-                    lc116Datalist.innerHTML = '';
-                    services.forEach((service) => {
-                        const option  = document.createElement('option');
-                        option.value  = service.label;
-                        lc116Datalist.appendChild(option);
-                        lc116ByLabel.set(service.label, service.code);
-                        lc116ByCode.set(service.code, service.label);
-                    });
-                };
-
                 const renderMunicipalities = (municipalities, selectedName, selectedCode) => {
                     municipalitySelect.innerHTML = '';
                     const placeholder       = document.createElement('option');
@@ -629,27 +903,8 @@ class="absolute inset-y-0 right-0 px-3 text-gray-500 hover:text-gray-700"
                     ibgeDisplay.value    = ibgeCode;
                 });
 
-                lc116DisplayInput?.addEventListener('input', () => {
-                    if (!lc116CodeInput) {
-                        return;
-                    }
-
-                    lc116CodeInput.value = lc116ByLabel.get(lc116DisplayInput.value) ?? '';
-                });
-
                 const ufs = await fetchJson(ufsUrl);
 
-                if (hasLc116Autocomplete) {
-                    const lc116Services = await fetchJson(lc116ServicesUrl);
-                    renderLc116Options(lc116Services);
-
-                    const initialLc116Label = lc116ByCode.get(selectedLc116Code);
-                    if (initialLc116Label && lc116DisplayInput && lc116CodeInput) {
-                        lc116DisplayInput.value = initialLc116Label;
-                        lc116CodeInput.value    = selectedLc116Code;
-                    }
-                }
-
                 ufSelect.innerHTML = '';
                 const ufPlaceholder       = document.createElement('option');
                 ufPlaceholder.value       = '';
diff --git a/Routes/admin.php b/Routes/admin.php
index e1829680..76b5e701 100644
--- a/Routes/admin.php
+++ b/Routes/admin.php
@@ -20,6 +20,7 @@
         Route::patch('/', [SettingsController::class, 'update'])->name('update');
         Route::patch('/vault', [SettingsController::class, 'updateVault'])->name('vault');
         Route::patch('/fiscal', [SettingsController::class, 'updateFiscal'])->name('fiscal');
+        Route::patch('/federal', [SettingsController::class, 'updateFederal'])->name('federal');
 
         // Company Services CRUD
         Route::get('services/create', [CompanyServiceController::class, 'create'])->name('services.create');
diff --git a/e2e/nfse-emission.spec.ts b/e2e/nfse-emission.spec.ts
new file mode 100644
index 00000000..249cdfa0
--- /dev/null
+++ b/e2e/nfse-emission.spec.ts
@@ -0,0 +1,70 @@
+// SPDX-FileCopyrightText: 2026 LibreCode coop and contributors
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import { expect, test } from '@playwright/test';
+import { loginToAkaunting } from './support/auth';
+
+const REAL_EMIT_FLOW_ENABLED = process.env.NFSE_E2E_REAL_EMIT_FLOW === '1';
+
+test.use({ serviceWorkers: 'block' });
+
+const emitFormsSelector = "form[action*='/nfse/invoices/'][action$='/emit']";
+
+test('pending invoices page exposes emission CTA when authenticated', async ({ page }, testInfo) => {
+  await loginToAkaunting(page, testInfo);
+
+  await page.goto('/1/nfse/invoices/pending', { waitUntil: 'domcontentloaded' });
+  await page.waitForLoadState('networkidle');
+
+  await expect(page).toHaveURL(/\/1\/nfse\/invoices\/pending/);
+
+  const emitButtons = page.locator(`${emitFormsSelector} button[type='submit']`);
+  const emitButtonsCount = await emitButtons.count();
+
+  if (emitButtonsCount > 0) {
+    await expect(emitButtons.first()).toBeVisible();
+  }
+});
+
+test('real happy path emits NFS-e from pending list', async ({ page }, testInfo) => {
+  test.setTimeout(180_000);
+
+  if (!REAL_EMIT_FLOW_ENABLED) {
+    test.skip(true, 'Set NFSE_E2E_REAL_EMIT_FLOW=1 to run real emission happy path.');
+  }
+
+  await loginToAkaunting(page, testInfo);
+
+  await page.goto('/1/nfse/invoices/pending', { waitUntil: 'domcontentloaded' });
+  await page.waitForLoadState('networkidle');
+
+  const emitButtons = page.locator(`${emitFormsSelector} button[type='submit']`);
+  const emitButtonsCount = await emitButtons.count();
+
+  if (emitButtonsCount === 0) {
+    test.skip(true, 'No pending invoices available to execute real emission happy path.');
+  }
+
+  const firstEmitButton = emitButtons.first();
+
+  await expect(firstEmitButton).toBeVisible();
+
+  if (!(await firstEmitButton.isEnabled())) {
+    const readinessItems = await page
+      .locator('li')
+      .filter({ hasText: /configured|configurado|ready|pront/i })
+      .allInnerTexts();
+
+    const details = readinessItems.length > 0 ? readinessItems.join('; ') : 'unknown configuration prerequisite';
+
+    throw new Error(`Real emission blocked by pending settings: ${details}`);
+  }
+
+  await firstEmitButton.click();
+
+  await page.waitForLoadState('networkidle');
+
+  await expect(page).toHaveURL(/\/1\/nfse\/invoices\/\d+$/);
+  await expect(page.locator('body')).toContainText(/(emitida com sucesso|successfully emitted)/i);
+  await expect(page.locator('body')).toContainText(/(dados da nfs-e|nfs-e data)/i);
+});
diff --git a/e2e/nfse-settings.spec.ts b/e2e/nfse-settings.spec.ts
index 9aa594a0..e1157b83 100644
--- a/e2e/nfse-settings.spec.ts
+++ b/e2e/nfse-settings.spec.ts
@@ -97,23 +97,6 @@ test('NFS-e settings screen is reachable and visible', async ({ page }, testInfo
     });
   });
 
-  await page.route('**/nfse/lc116/services', (route) => {
-    route.fulfill({
-      status: 200,
-      contentType: 'application/json',
-      body: JSON.stringify({
-        data: [
-          {
-            code: '0107',
-            display_code: '1.07',
-            description: 'Suporte tecnico em informatica, inclusive instalacao, configuracao e manutencao',
-            label: '1.07 - Suporte tecnico em informatica, inclusive instalacao, configuracao e manutencao',
-          },
-        ],
-      }),
-    });
-  });
-
   await page.goto('/1/nfse/settings', { waitUntil: 'domcontentloaded' });
   await page.waitForLoadState('networkidle');
 
@@ -146,18 +129,10 @@ test('NFS-e settings screen is reachable and visible', async ({ page }, testInfo
   await expect(page.locator('select[name="nfse[uf]"]')).toBeVisible();
   await expect(page.locator('select[name="nfse[municipio_nome]"]')).toBeVisible();
   await expect(page.locator('input[name="nfse[municipio_ibge]"]')).toBeAttached();
-  await expect(page.locator('input[name="nfse[item_lista_servico_display]"]')).toBeVisible();
-  await expect(page.locator('input[name="nfse[item_lista_servico]"]')).toBeAttached();
 
   await page.locator('select[name="nfse[uf]"]').selectOption('SP');
   await page.locator('select[name="nfse[municipio_nome]"]').selectOption('Sao Paulo');
   await expect(page.locator('input[name="nfse[municipio_ibge]"]')).toHaveValue('3550308');
-
-  const firstLc116Label = await page.locator('#lc116_services option').first().getAttribute('value');
-  expect(firstLc116Label).toBeTruthy();
-
-  await page.locator('input[name="nfse[item_lista_servico_display]"]').fill(firstLc116Label!);
-  await expect(page.locator('input[name="nfse[item_lista_servico]"]')).toHaveValue('0107');
 });
 
 test('vault status summary shows certificate secret checklist row', async ({ page }, testInfo) => {
@@ -200,23 +175,6 @@ test('full dependent setup flow covers vault, certificate, fiscal and services s
     });
   });
 
-  await page.route('**/nfse/lc116/services', (route) => {
-    route.fulfill({
-      status: 200,
-      contentType: 'application/json',
-      body: JSON.stringify({
-        data: [
-          {
-            code: '0107',
-            display_code: '1.07',
-            description: 'Suporte tecnico em informatica',
-            label: '1.07 - Suporte tecnico em informatica',
-          },
-        ],
-      }),
-    });
-  });
-
   await page.goto('/1/nfse/settings', { waitUntil: 'domcontentloaded' });
   await page.waitForLoadState('networkidle');
 
@@ -251,12 +209,6 @@ test('full dependent setup flow covers vault, certificate, fiscal and services s
   await page.locator('select[name="nfse[uf]"]').selectOption('SP');
   await page.locator('select[name="nfse[municipio_nome]"]').selectOption('Sao Paulo');
   await expect(page.locator('input[name="nfse[municipio_ibge]"]')).toHaveValue('3550308');
-
-  const firstLc116Label = await page.locator('#lc116_services option').first().getAttribute('value');
-  expect(firstLc116Label).toBeTruthy();
-
-  await page.locator('input[name="nfse[item_lista_servico_display]"]').fill(firstLc116Label!);
-  await expect(page.locator('input[name="nfse[item_lista_servico]"]')).toHaveValue('0107');
   await page.locator('#tab-panel-fiscal button[type="submit"]').click();
   await page.waitForLoadState('networkidle');
   await expect(page).toHaveURL(/\/1\/nfse\/settings\?tab=fiscal/);
diff --git a/e2e/support/auth.ts b/e2e/support/auth.ts
index 12465afe..f5bcf0fc 100644
--- a/e2e/support/auth.ts
+++ b/e2e/support/auth.ts
@@ -16,10 +16,49 @@ export async function loginToAkaunting(page: Page, testInfo: TestInfo): Promise<
   await page.locator('input[name="email"]').fill(email);
   await page.locator('input[name="password"]').fill(password);
 
-  await Promise.all([
-    page.waitForURL((url) => !url.pathname.endsWith('/auth/login')),
-    page.locator('form[action*="auth/login"] button[type="submit"]').click(),
-  ]);
+  const loginResponsePromise = page.waitForResponse((response) => {
+    return response.request().method() === 'POST' && response.url().includes('/auth/login');
+  });
+
+  await page.locator('form[action*="auth/login"] button[type="submit"]').click();
+
+  const loginResponse = await loginResponsePromise;
+
+  try {
+    await page.waitForURL((url) => !url.pathname.endsWith('/auth/login'), { timeout: 10_000 });
+  } catch {
+    // Some Akaunting setups return AJAX JSON and keep the current URL.
+    // In this case we use the JSON payload to continue or fail fast.
+  }
+
+  if (/\/auth\/login$/.test(page.url())) {
+    let payload: Record<string, unknown> | null = null;
+
+    try {
+      payload = (await loginResponse.json()) as Record<string, unknown>;
+    } catch {
+      payload = null;
+    }
+
+    if ((payload?.success as boolean | undefined) === true) {
+      const redirectPath = typeof payload.redirect === 'string' && payload.redirect !== ''
+        ? payload.redirect
+        : '/';
+
+      await page.goto(redirectPath, { waitUntil: 'domcontentloaded' });
+    }
+  }
+
+  if (/\/auth\/login$/.test(page.url())) {
+    const inlineError = page.locator('text=These credentials do not match our records.');
+    const hasInlineError = await inlineError.count();
+
+    if (hasInlineError > 0) {
+      throw new Error('E2E login failed: credentials were rejected by Akaunting.');
+    }
+
+    throw new Error('E2E login did not complete: no redirect and no success payload were observed.');
+  }
 
   await expect(page).not.toHaveURL(/\/auth\/login$/);
   await expect(page.locator('body')).toBeVisible();
diff --git a/tests/Unit/Http/Controllers/CompanyServiceRouteUsageTest.php b/tests/Unit/Http/Controllers/CompanyServiceRouteUsageTest.php
index 5331d37e..d85c550e 100644
--- a/tests/Unit/Http/Controllers/CompanyServiceRouteUsageTest.php
+++ b/tests/Unit/Http/Controllers/CompanyServiceRouteUsageTest.php
@@ -41,6 +41,17 @@ public function testCompanyServiceControllerSupportsToggleActiveEndpoint(): void
         self::assertStringContainsString("route('nfse.settings.edit', ['tab' => 'services'])", $content);
     }
 
+    public function testCompanyServiceControllerDoesNotMirrorDefaultServiceIntoLegacySettings(): void
+    {
+        $content = file_get_contents(dirname(__DIR__, 4) . '/Http/Controllers/CompanyServiceController.php');
+
+        self::assertNotFalse($content);
+        self::assertStringNotContainsString('syncDefaultServiceSettings', $content);
+        self::assertStringNotContainsString("'nfse.item_lista_servico'", $content);
+        self::assertStringNotContainsString("'nfse.codigo_tributacao_nacional'", $content);
+        self::assertStringNotContainsString("'nfse.aliquota'", $content);
+    }
+
     public function testServiceViewsUseDefinedSettingsEditRouteForBackAndCancel(): void
     {
         $createView = file_get_contents(dirname(__DIR__, 4) . '/Resources/views/services/create.blade.php');
diff --git a/tests/Unit/Http/Controllers/InvoiceControllerTest.php b/tests/Unit/Http/Controllers/InvoiceControllerTest.php
index 265cbc60..a72dc0c0 100644
--- a/tests/Unit/Http/Controllers/InvoiceControllerTest.php
+++ b/tests/Unit/Http/Controllers/InvoiceControllerTest.php
@@ -10,7 +10,7 @@
 }
 
 namespace Modules\Nfse\Tests\Unit\Http\Controllers {
-    use App\Models\Sale\Invoice;
+    use App\Models\Document\Document as Invoice;
     use Illuminate\Http\Request;
     use LibreCodeCoop\NfsePHP\Contracts\NfseClientInterface;
     use LibreCodeCoop\NfsePHP\Dto\DpsData;
@@ -36,6 +36,14 @@ public function testControllerUsesDocumentModelAliasForInvoices(): void
             self::assertStringContainsString('Invoice::invoice()', $content);
         }
 
+        public function testCompanyServiceSelectionSupportRecognizesEloquentModelWithoutMethodExistsWhereCheck(): void
+        {
+            $content = (string) file_get_contents(dirname(__DIR__, 4) . '/Http/Controllers/InvoiceController.php');
+
+            self::assertStringContainsString('is_subclass_of(CompanyService::class', $content);
+            self::assertStringNotContainsString("method_exists(CompanyService::class, 'where')", $content);
+        }
+
         public function testProjectRootPathUsesIsolationApplicationBasePath(): void
         {
             $controller = new class () extends InvoiceController {
@@ -69,7 +77,7 @@ protected function setUp(): void
                 'nfse::general.nfse_pfx_import_failed'   => 'Nao foi possivel importar o certificado PFX.',
                 'nfse::general.cancel_motivo_default' => 'Cancelamento padrao',
                 'nfse::general.service_default' => 'Servico padrao',
-                'nfse::general.invoices.emit_blocked_not_ready' => 'Ambiente nao esta pronto para emissao.',
+                'nfse::general.invoices.emit_blocked_not_ready' => 'Existem configuracoes pendentes para liberar a emissao.',
             ];
             ControllerIsolationState::$settings = [
                 'nfse.cnpj_prestador' => '12345678000195',
@@ -77,6 +85,17 @@ protected function setUp(): void
                 'nfse.item_lista_servico' => '0107',
                 'nfse.codigo_tributacao_nacional' => '010701',
                 'nfse.aliquota' => '4.50',
+                'nfse.federal_piscofins_situacao_tributaria' => '1',
+                'nfse.federal_piscofins_tipo_retencao' => '3',
+                'nfse.federal_piscofins_base_calculo' => '1500.25',
+                'nfse.federal_piscofins_aliquota_pis' => '1.65',
+                'nfse.federal_piscofins_valor_pis' => '24.75',
+                'nfse.federal_piscofins_aliquota_cofins' => '7.60',
+                'nfse.federal_piscofins_valor_cofins' => '114.02',
+                'nfse.federal_valor_irrf' => '15.00',
+                'nfse.federal_valor_csll' => '10.00',
+                'nfse.federal_valor_cp' => '5.00',
+                'nfse.tributacao_federal_mode' => 'per_invoice_amounts',
                 'nfse.sandbox_mode' => false,
             ];
 
@@ -103,6 +122,7 @@ public function testEmitBuildsDpsPersistsReceiptAndRedirectsToShowPage(): void
                 contactName: 'ACME Ltda',
                 contactTaxNumber: '99887766000155',
             );
+            $invoice->issued_at = '2026-02-04 08:37:53';
 
             $client = new class () implements NfseClientInterface {
                 public ?DpsData $capturedDps = null;
@@ -164,6 +184,20 @@ protected function hasCertificateSecret(string $cnpj): bool
             self::assertSame('ACME Ltda', $client->capturedDps?->nomeTomador);
             self::assertSame(2, $client->capturedDps?->opcaoSimplesNacional);
             self::assertSame(1, $client->capturedDps?->tipoAmbiente);
+            self::assertSame('1', $client->capturedDps?->federalPiscofinsSituacaoTributaria);
+            self::assertSame('3', $client->capturedDps?->federalPiscofinsTipoRetencao);
+            self::assertSame('1500.25', $client->capturedDps?->federalPiscofinsBaseCalculo);
+            self::assertSame('1.65', $client->capturedDps?->federalPiscofinsAliquotaPis);
+            self::assertSame('24.75', $client->capturedDps?->federalPiscofinsValorPis);
+            self::assertSame('7.60', $client->capturedDps?->federalPiscofinsAliquotaCofins);
+            self::assertSame('114.02', $client->capturedDps?->federalPiscofinsValorCofins);
+            self::assertSame('15.00', $client->capturedDps?->federalValorIrrf);
+            self::assertSame('10.00', $client->capturedDps?->federalValorCsll);
+            self::assertSame('5.00', $client->capturedDps?->federalValorCp);
+            self::assertSame(0, $client->capturedDps?->indicadorTributacao);
+            self::assertSame('00001', $client->capturedDps?->serie);
+            self::assertSame('42', $client->capturedDps?->numeroDps);
+            self::assertSame('2026-02-04', $client->capturedDps?->dataCompetencia);
             self::assertSame([
                 [
                     'attributes' => ['invoice_id' => 42],
@@ -182,6 +216,284 @@ protected function hasCertificateSecret(string $cnpj): bool
             self::assertSame('NFS-e emitida NF-2026-0001', $response->flash['success'] ?? null);
         }
 
+        public function testEmitCalculatesValoresFromAliquotasInPercentageProfileMode(): void
+        {
+            ControllerIsolationState::$settings['nfse.tributacao_federal_mode'] = 'percentage_profile';
+            // Override stored absolute valores with distinct values to prove they are NOT used
+            ControllerIsolationState::$settings['nfse.federal_piscofins_base_calculo'] = '999.00';
+            ControllerIsolationState::$settings['nfse.federal_piscofins_valor_pis'] = '999.00';
+            ControllerIsolationState::$settings['nfse.federal_piscofins_valor_cofins'] = '999.00';
+
+            $invoice = InvoiceControllerIsolationState::makeInvoice(
+                id: 43,
+                amount: 1500.25,
+                items: [['name' => 'Servico C']],
+                contactTaxNumber: '99887766000155',
+            );
+            $invoice->issued_at = '2026-02-04 08:37:53';
+
+            $client = new class () implements NfseClientInterface {
+                public ?DpsData $capturedDps = null;
+
+                public function emit(DpsData $dps): ReceiptData
+                {
+                    $this->capturedDps = $dps;
+
+                    return new ReceiptData('NF-43', 'CHAVE-43', '2026-03-21T10:30:00-03:00');
+                }
+
+                public function query(string $chaveAcesso): ReceiptData
+                {
+                    throw new \BadMethodCallException('Not used in this test.');
+                }
+
+                public function cancel(string $chaveAcesso, string $motivo): bool
+                {
+                    throw new \BadMethodCallException('Not used in this test.');
+                }
+            };
+
+            $controller = new class ($client) extends InvoiceController {
+                public function __construct(private readonly NfseClientInterface $client)
+                {
+                }
+
+                protected function makeClient(bool $sandboxMode): NfseClientInterface
+                {
+                    return $this->client;
+                }
+
+                protected function hasCertificateSecret(string $cnpj): bool
+                {
+                    return true;
+                }
+            };
+
+            $controller->emit($invoice);
+
+            // Base = invoice amount, not stored setting '999.00'
+            self::assertSame('1500.25', $client->capturedDps?->federalPiscofinsBaseCalculo);
+            // PIS valor = 1500.25 × 1.65 / 100 = 24.75 (not stored '999.00')
+            self::assertSame('24.75', $client->capturedDps?->federalPiscofinsValorPis);
+            // COFINS valor = 1500.25 × 7.60 / 100 = 114.02 (not stored '999.00')
+            self::assertSame('114.02', $client->capturedDps?->federalPiscofinsValorCofins);
+            // Aliquotas are still from settings
+            self::assertSame('1.65', $client->capturedDps?->federalPiscofinsAliquotaPis);
+            self::assertSame('7.60', $client->capturedDps?->federalPiscofinsAliquotaCofins);
+            // Retention amounts still from settings (not percentage-calculated)
+            self::assertSame('15.00', $client->capturedDps?->federalValorIrrf);
+            self::assertSame('10.00', $client->capturedDps?->federalValorCsll);
+            self::assertSame('5.00', $client->capturedDps?->federalValorCp);
+            // No tributos_* percent configured → indicadorTributacao = 0
+            self::assertSame(0, $client->capturedDps?->indicadorTributacao);
+        }
+
+        public function testEmitSetsIndicadorTributacaoTwoWhenTributosPercentConfigured(): void
+        {
+            ControllerIsolationState::$settings['nfse.tributos_fed_p'] = '10.50';
+
+            $invoice = InvoiceControllerIsolationState::makeInvoice(
+                id: 44,
+                amount: 500.00,
+                items: [['name' => 'Servico D']],
+                contactTaxNumber: '99887766000155',
+            );
+            $invoice->issued_at = '2026-02-04 08:37:53';
+
+            $client = new class () implements NfseClientInterface {
+                public ?DpsData $capturedDps = null;
+
+                public function emit(DpsData $dps): ReceiptData
+                {
+                    $this->capturedDps = $dps;
+
+                    return new ReceiptData('NF-44', 'CHAVE-44', '2026-03-21T10:30:00-03:00');
+                }
+
+                public function query(string $chaveAcesso): ReceiptData
+                {
+                    throw new \BadMethodCallException('Not used in this test.');
+                }
+
+                public function cancel(string $chaveAcesso, string $motivo): bool
+                {
+                    throw new \BadMethodCallException('Not used in this test.');
+                }
+            };
+
+            $controller = new class ($client) extends InvoiceController {
+                public function __construct(private readonly NfseClientInterface $client)
+                {
+                }
+
+                protected function makeClient(bool $sandboxMode): NfseClientInterface
+                {
+                    return $this->client;
+                }
+
+                protected function hasCertificateSecret(string $cnpj): bool
+                {
+                    return true;
+                }
+            };
+
+            $controller->emit($invoice);
+
+            self::assertSame(2, $client->capturedDps?->indicadorTributacao);
+        }
+
+        public function testEmitPrefersDefaultCompanyServiceOverLegacyFiscalSettings(): void
+        {
+            $invoice = InvoiceControllerIsolationState::makeInvoice(
+                id: 52,
+                amount: 875.4,
+                items: [],
+                description: 'Servico do cadastro padrao',
+                contactName: 'Cliente Padrao',
+                contactTaxNumber: '11222333000144',
+            );
+
+            $client = new class () implements NfseClientInterface {
+                public ?DpsData $capturedDps = null;
+
+                public function emit(DpsData $dps): ReceiptData
+                {
+                    $this->capturedDps = $dps;
+
+                    return new ReceiptData('NF-52', 'CHAVE-52', '2026-03-23T15:00:00-03:00');
+                }
+
+                public function query(string $chaveAcesso): ReceiptData
+                {
+                    throw new \BadMethodCallException('Not used in this test.');
+                }
+
+                public function cancel(string $chaveAcesso, string $motivo): bool
+                {
+                    throw new \BadMethodCallException('Not used in this test.');
+                }
+            };
+
+            $controller = new class ($client) extends InvoiceController {
+                public function __construct(private readonly NfseClientInterface $client)
+                {
+                }
+
+                protected function makeClient(bool $sandboxMode): NfseClientInterface
+                {
+                    return $this->client;
+                }
+
+                protected function hasCertificateSecret(string $cnpj): bool
+                {
+                    return true;
+                }
+
+                protected function resolveDefaultCompanyService(?Invoice $invoice = null): ?object
+                {
+                    return (object) [
+                        'item_lista_servico' => '1401',
+                        'codigo_tributacao_nacional' => '140101',
+                        'aliquota' => '6.75',
+                        'description' => 'Consultoria padrao',
+                        'is_default' => true,
+                        'is_active' => true,
+                    ];
+                }
+            };
+
+            $controller->emit($invoice);
+
+            self::assertSame('1401', $client->capturedDps?->itemListaServico);
+            self::assertSame('140101', $client->capturedDps?->codigoTributacaoNacional);
+            self::assertSame('6.75', $client->capturedDps?->aliquota);
+        }
+
+        public function testNationalTaxCodeFallsBackToSettingWhenDefaultServiceCodeIsMissing(): void
+        {
+            $controller = new class () extends InvoiceController {
+                public function exposedNationalTaxCode(?object $defaultService = null): string
+                {
+                    return $this->nationalTaxCode($defaultService);
+                }
+
+                protected function supportsCompanyServiceSelection(): bool
+                {
+                    return true;
+                }
+            };
+
+            $defaultService = (object) [
+                'item_lista_servico' => '1401',
+                'codigo_tributacao_nacional' => null,
+                'aliquota' => '5.00',
+            ];
+
+            self::assertSame('010701', $controller->exposedNationalTaxCode($defaultService));
+        }
+
+        public function testItemListaServicoPreservesThreeDigitMunicipalCode(): void
+        {
+            $controller = new class () extends InvoiceController {
+                public function exposedItemListaServico(?object $defaultService = null): string
+                {
+                    return $this->itemListaServico($defaultService);
+                }
+
+                protected function supportsCompanyServiceSelection(): bool
+                {
+                    return true;
+                }
+            };
+
+            $defaultService = (object) [
+                'item_lista_servico' => '001',
+                'codigo_tributacao_nacional' => '010101',
+                'aliquota' => '2.00',
+            ];
+
+            self::assertSame('001', $controller->exposedItemListaServico($defaultService));
+        }
+
+        public function testEmissionReadinessDoesNotRequireNationalTaxCodeWhenUsingCompanyServices(): void
+        {
+            $invoice = InvoiceControllerIsolationState::makeInvoice(id: 88, amount: 100.0, items: []);
+
+            $controller = new class () extends InvoiceController {
+                public function exposedEmissionReadiness(): array
+                {
+                    return $this->emissionReadiness();
+                }
+
+                protected function resolveDefaultCompanyService(?Invoice $invoice = null): ?object
+                {
+                    return (object) [
+                        'item_lista_servico' => '1401',
+                        'codigo_tributacao_nacional' => null,
+                        'aliquota' => '5.00',
+                        'is_default' => true,
+                        'is_active' => true,
+                    ];
+                }
+
+                protected function supportsCompanyServiceSelection(): bool
+                {
+                    return true;
+                }
+
+                protected function hasCertificateSecret(string $cnpj): bool
+                {
+                    return true;
+                }
+            };
+
+            $readiness = $controller->exposedEmissionReadiness();
+
+            self::assertTrue($readiness['isReady'] ?? false);
+            self::assertArrayNotHasKey('codigo_tributacao_nacional', $readiness['checklist']);
+            self::assertSame(true, $readiness['checklist']['item_lista_servico'] ?? null);
+        }
+
         public function testEmitSetsTipoAmbienteFromSandboxMode(): void
         {
             ControllerIsolationState::$settings['nfse.sandbox_mode'] = true;
@@ -866,7 +1178,7 @@ protected function makeClient(bool $sandboxMode): NfseClientInterface
 
             self::assertSame('route', $response->target);
             self::assertSame('nfse.invoices.pending', $response->route);
-            self::assertSame('Ambiente nao esta pronto para emissao.', $response->flash['error'] ?? null);
+            self::assertSame('Existem configuracoes pendentes para liberar a emissao.', $response->flash['error'] ?? null);
             self::assertSame([], NfseReceipt::$updateOrCreateCalls);
         }
 
diff --git a/tests/Unit/Http/Controllers/SettingsControllerTest.php b/tests/Unit/Http/Controllers/SettingsControllerTest.php
index d2355af6..3ae3a2a9 100644
--- a/tests/Unit/Http/Controllers/SettingsControllerTest.php
+++ b/tests/Unit/Http/Controllers/SettingsControllerTest.php
@@ -1136,6 +1136,7 @@ public function testUpdateFiscalSavesFiscalSettingsAndRedirectsToFiscalTab(): vo
                         'uf'                => 'rj',
                         'municipio_nome'    => 'Niteroi',
                         'municipio_ibge'    => '3303302',
+                        'opcao_simples_nacional' => '1',
                         'sandbox_mode'      => '1',
                     ],
                 ],
@@ -1152,6 +1153,7 @@ public function testUpdateFiscalSavesFiscalSettingsAndRedirectsToFiscalTab(): vo
             self::assertSame('RJ', ControllerIsolationState::$settings['nfse.uf'] ?? null);
             self::assertSame('Niteroi', ControllerIsolationState::$settings['nfse.municipio_nome'] ?? null);
             self::assertSame('3303302', ControllerIsolationState::$settings['nfse.municipio_ibge'] ?? null);
+            self::assertSame('1', ControllerIsolationState::$settings['nfse.opcao_simples_nacional'] ?? null);
             self::assertArrayNotHasKey('nfse.item_lista_servico', ControllerIsolationState::$settings);
             self::assertArrayNotHasKey('nfse.aliquota', ControllerIsolationState::$settings);
             // Vault keys must not be overwritten by fiscal save
@@ -1185,6 +1187,86 @@ public function testUpdateFiscalRedirectsWithErrorWhenVaultIsNotReady(): void
             self::assertSame(0, ControllerIsolationState::$savedCount);
         }
 
+        public function testUpdateFederalSavesFederalTaxationSettingsAndRedirectsToFederalTab(): void
+        {
+            ControllerIsolationState::reset();
+            ControllerIsolationState::$settings = [
+                'nfse.bao_addr'  => 'http://openbao:8200',
+                'nfse.bao_mount' => '/nfse',
+                'nfse.bao_token' => 'dev-only-root-token',
+            ];
+
+            $request = new Request(
+                inputs: [
+                    'nfse' => [
+                        'tributacao_federal_mode' => 'percentage_profile',
+                        'federal_piscofins_situacao_tributaria' => '4',
+                        'federal_piscofins_tipo_retencao' => '3',
+                        'federal_piscofins_base_calculo' => '1000,00',
+                        'federal_piscofins_aliquota_pis' => '1,65',
+                        'federal_piscofins_valor_pis' => '16,50',
+                        'federal_piscofins_aliquota_cofins' => '7,60',
+                        'federal_piscofins_valor_cofins' => '76,00',
+                        'federal_valor_irrf' => '15,00',
+                        'federal_valor_csll' => '10,00',
+                        'federal_valor_cp' => '5,00',
+                        'tributos_fed_p' => '8,55',
+                        'tributos_est_p' => '2.10',
+                        'tributos_mun_p' => '1.35',
+                        'tributos_fed_sn' => '4.00',
+                        'tributos_est_sn' => '1.20',
+                        'tributos_mun_sn' => '0.80',
+                    ],
+                ],
+            );
+
+            $response = (new SettingsController())->updateFederal($request);
+
+            self::assertInstanceOf(RedirectResponse::class, $response);
+            self::assertSame('route', $response->target);
+            self::assertSame('nfse.settings.edit', $response->route);
+            self::assertSame(['tab' => 'federal'], $response->parameters[0] ?? null);
+            self::assertSame('nfse::general.saved', $response->flash['success'] ?? null);
+            self::assertSame('percentage_profile', ControllerIsolationState::$settings['nfse.tributacao_federal_mode'] ?? null);
+            self::assertSame('4', ControllerIsolationState::$settings['nfse.federal_piscofins_situacao_tributaria'] ?? null);
+            self::assertSame('3', ControllerIsolationState::$settings['nfse.federal_piscofins_tipo_retencao'] ?? null);
+            self::assertSame('1000.00', ControllerIsolationState::$settings['nfse.federal_piscofins_base_calculo'] ?? null);
+            self::assertSame('1.65', ControllerIsolationState::$settings['nfse.federal_piscofins_aliquota_pis'] ?? null);
+            self::assertSame('16.50', ControllerIsolationState::$settings['nfse.federal_piscofins_valor_pis'] ?? null);
+            self::assertSame('7.60', ControllerIsolationState::$settings['nfse.federal_piscofins_aliquota_cofins'] ?? null);
+            self::assertSame('76.00', ControllerIsolationState::$settings['nfse.federal_piscofins_valor_cofins'] ?? null);
+            self::assertSame('15.00', ControllerIsolationState::$settings['nfse.federal_valor_irrf'] ?? null);
+            self::assertSame('10.00', ControllerIsolationState::$settings['nfse.federal_valor_csll'] ?? null);
+            self::assertSame('5.00', ControllerIsolationState::$settings['nfse.federal_valor_cp'] ?? null);
+            self::assertSame('8.55', ControllerIsolationState::$settings['nfse.tributos_fed_p'] ?? null);
+            self::assertSame('2.10', ControllerIsolationState::$settings['nfse.tributos_est_p'] ?? null);
+            self::assertSame('1.35', ControllerIsolationState::$settings['nfse.tributos_mun_p'] ?? null);
+            self::assertSame('4.00', ControllerIsolationState::$settings['nfse.tributos_fed_sn'] ?? null);
+            self::assertSame('1.20', ControllerIsolationState::$settings['nfse.tributos_est_sn'] ?? null);
+            self::assertSame('0.80', ControllerIsolationState::$settings['nfse.tributos_mun_sn'] ?? null);
+        }
+
+        public function testUpdateFederalRedirectsWithErrorWhenVaultIsNotReady(): void
+        {
+            ControllerIsolationState::reset();
+
+            $request = new Request(
+                inputs: [
+                    'nfse' => [
+                        'tributacao_federal_mode' => 'per_invoice_amounts',
+                    ],
+                ],
+            );
+
+            $response = (new SettingsController())->updateFederal($request);
+
+            self::assertInstanceOf(RedirectResponse::class, $response);
+            self::assertSame('route', $response->target);
+            self::assertSame('nfse.settings.edit', $response->route);
+            self::assertSame(['tab' => 'vault'], $response->parameters[0] ?? null);
+            self::assertSame('nfse::general.vault_required_before_certificate_and_settings', $response->flash['error'] ?? null);
+        }
+
         // ── edit() tab resolution ───────────────────────────────────────────
 
         public function testEditDefaultsToVaultTabWhenNoRequestProvided(): void
@@ -1230,6 +1312,23 @@ public function testEditAcceptsServicesTabFromRequestQueryParameter(): void
             self::assertSame('services', $response->data['activeTab'] ?? null);
         }
 
+        public function testEditAcceptsFederalTabFromRequestQueryParameter(): void
+        {
+            ControllerIsolationState::reset();
+            ControllerIsolationState::$settings = [
+                'nfse.bao_addr' => 'http://openbao:8200',
+                'nfse.bao_mount' => '/nfse',
+                'nfse.bao_token' => 'token',
+                'nfse.cnpj_prestador' => '12345678000190',
+            ];
+
+            $request = new Request(inputs: ['tab' => 'federal']);
+
+            $response = (new SettingsController())->edit($request);
+
+            self::assertSame('federal', $response->data['activeTab'] ?? null);
+        }
+
         public function testEditFallsBackToVaultTabWhenTabValueIsInvalid(): void
         {
             ControllerIsolationState::reset();
diff --git a/tests/Unit/Views/OperationalViewsExistenceTest.php b/tests/Unit/Views/OperationalViewsExistenceTest.php
index 2e77e167..acfb75b3 100644
--- a/tests/Unit/Views/OperationalViewsExistenceTest.php
+++ b/tests/Unit/Views/OperationalViewsExistenceTest.php
@@ -76,6 +76,8 @@ public function testPendingViewListsSpecificMissingChecklistItemsWhenNotReady():
             // The view must iterate \$checklist to surface per-item labels rather than a generic banner.
             self::assertStringContainsString('$checklist', $content);
             self::assertStringContainsString("nfse::general.readiness.checks.", $content);
+            self::assertStringContainsString("route('nfse.settings.edit', ['tab' => 'services'])", $content);
+            self::assertStringContainsString("trans('nfse::general.go_to_settings')", $content);
         }
 
         public function testSettingsViewShowsVaultStatusAndSensitiveFieldClearControls(): void
@@ -148,6 +150,50 @@ public function testSettingsViewShowsVaultStatusAndSensitiveFieldClearControls()
             self::assertStringContainsString("setting('nfse.bao_mount', '/nfse')", $content);
         }
 
+        public function testSettingsViewKeepsServiceSelectionOnlyInServicesTab(): void
+        {
+            $settingsPath = dirname(__DIR__, 3) . '/Resources/views/settings/edit.blade.php';
+            $content = (string) file_get_contents($settingsPath);
+
+            self::assertStringContainsString('name="nfse[opcao_simples_nacional]"', $content);
+            self::assertStringNotContainsString('name="nfse[item_lista_servico_display]"', $content);
+            self::assertStringNotContainsString('name="nfse[item_lista_servico]"', $content);
+            self::assertStringNotContainsString('id="lc116_services"', $content);
+            self::assertStringNotContainsString("document.getElementById('item_lista_servico_display')", $content);
+            self::assertStringContainsString("trans('nfse::general.settings.federal.tab_title')", $content);
+            self::assertStringContainsString("route('nfse.settings.federal')", $content);
+            self::assertStringContainsString('name="nfse[tributacao_federal_mode]"', $content);
+            self::assertStringContainsString('name="nfse[federal_piscofins_situacao_tributaria]"', $content);
+            self::assertStringContainsString('name="nfse[federal_piscofins_tipo_retencao]"', $content);
+            self::assertStringContainsString('name="nfse[federal_piscofins_base_calculo]"', $content);
+            self::assertStringContainsString('name="nfse[federal_piscofins_valor_cofins]"', $content);
+            self::assertStringContainsString('name="nfse[federal_valor_csll]"', $content);
+            self::assertStringContainsString('id="federal-piscofins-panel"', $content);
+            self::assertStringContainsString('id="federal-piscofins-situacao"', $content);
+            self::assertStringContainsString('id="federal-piscofins-tipo-retencao"', $content);
+            self::assertStringContainsString('name="nfse[tributos_fed_p]"', $content);
+            self::assertStringContainsString('name="nfse[tributos_mun_sn]"', $content);
+        }
+
+        public function testSettingsTranslationsDoNotExposeInternalOpSimpNacFieldNames(): void
+        {
+            $ptBrPath = dirname(__DIR__, 3) . '/Resources/lang/pt-BR/general.php';
+            $enGbPath = dirname(__DIR__, 3) . '/Resources/lang/en-GB/general.php';
+
+            $ptBrContent = (string) file_get_contents($ptBrPath);
+            $enGbContent = (string) file_get_contents($enGbPath);
+
+            self::assertStringNotContainsString('opSimpNac', $ptBrContent);
+            self::assertStringNotContainsString('opSimpNac', $enGbContent);
+            self::assertStringNotContainsString('prontidão operacional', $ptBrContent);
+            self::assertStringNotContainsString('operational readiness', $enGbContent);
+
+            self::assertStringContainsString("'opcao_simples_nacional_not_optant' => 'Não optante'", $ptBrContent);
+            self::assertStringContainsString("'opcao_simples_nacional_optant' => 'Optante'", $ptBrContent);
+            self::assertStringContainsString("'go_to_settings'        => 'Ver configurações'", $ptBrContent);
+            self::assertStringContainsString("'go_to_settings'        => 'View settings'", $enGbContent);
+        }
+
         public function testPendingInvoicesViewShowsCompactSummaryAndCustomFilterInput(): void
         {
             $pendingPath = dirname(__DIR__, 3) . '/Resources/views/invoices/pending.blade.php';
diff --git a/tests/integration/features/nfse_endpoints.feature b/tests/integration/features/nfse_endpoints.feature
index 92eb2c2e..a4c4f2bf 100644
--- a/tests/integration/features/nfse_endpoints.feature
+++ b/tests/integration/features/nfse_endpoints.feature
@@ -19,8 +19,6 @@ Feature: NFS-e endpoints contract
     And the response body should contain "nfse[uf]"
     And the response body should contain "nfse[municipio_nome]"
     And the response body should contain "nfse[municipio_ibge]"
-    And the response body should contain "nfse[item_lista_servico_display]"
-    And the response body should contain "nfse[item_lista_servico]"
 
   Scenario: Settings update endpoint accepts valid payload and redirects back
     When I send "PATCH" request to "/<company_id>/nfse/settings" with form data:
@@ -28,8 +26,6 @@ Feature: NFS-e endpoints contract
       | nfse[uf] | SP                             |
       | nfse[municipio_nome] | Sao Paulo         |
       | nfse[municipio_ibge] | 3550308             |
-      | nfse[item_lista_servico] | 0107            |
-      | nfse[aliquota] | 5.00                     |
       | nfse[sandbox_mode] | 1                     |
       | nfse[bao_addr] | https://vault.local.test |
       | nfse[bao_mount] | nfse                    |
@@ -45,8 +41,6 @@ Feature: NFS-e endpoints contract
       | nfse[uf] | SP                             |
       | nfse[municipio_nome] | Sao Paulo         |
       | nfse[municipio_ibge] | 3550308             |
-      | nfse[item_lista_servico] | 0107            |
-      | nfse[aliquota] | 5.00                     |
       | nfse[sandbox_mode] | 1                     |
       | nfse[bao_addr] | https://vault.local.test |
       | nfse[bao_mount] | nfse                    |
@@ -61,8 +55,6 @@ Feature: NFS-e endpoints contract
       | nfse[uf] | SP                             |
       | nfse[municipio_nome] | Sao Paulo         |
       | nfse[municipio_ibge] | 3550308             |
-      | nfse[item_lista_servico] | 0107            |
-      | nfse[aliquota] | 5.00                     |
       | nfse[sandbox_mode] | 1                     |
       | nfse[bao_addr] | https://vault.local.test |
       | nfse[bao_mount] | nfse                    |
@@ -82,8 +74,6 @@ Feature: NFS-e endpoints contract
       | nfse[uf] | SP                             |
       | nfse[municipio_nome] | Sao Paulo         |
       | nfse[municipio_ibge] | 3550308             |
-      | nfse[item_lista_servico] | 0107            |
-      | nfse[aliquota] | 5.00                     |
       | nfse[sandbox_mode] | 1                     |
       | nfse[bao_addr] | https://vault.local.test |
       | nfse[bao_mount] | nfse                    |
@@ -135,8 +125,6 @@ Feature: NFS-e endpoints contract
       | nfse[uf] | SP                             |
       | nfse[municipio_nome] | Sao Paulo         |
       | nfse[municipio_ibge] | 3550308             |
-      | nfse[item_lista_servico] | 0107            |
-      | nfse[aliquota] | 5.00                     |
       | nfse[sandbox_mode] | 1                     |
       | nfse[bao_addr] | https://vault.local.test |
       | nfse[bao_mount] | nfse                    |