diff --git a/catatan_rilis.md b/catatan_rilis.md
index ac8b85bb..b3a67d79 100644
--- a/catatan_rilis.md
+++ b/catatan_rilis.md
@@ -17,6 +17,7 @@ Di rilis ini, versi 2601.0.0 berisi penambahan dan perbaikan yang diminta penggu
 13. [#921](https://github.com/OpenSID/OpenKab/issues/921) Penambahan fitur expor excel pada data presisi jaminan sosial.
 14. [#920](https://github.com/OpenSID/OpenKab/issues/920) Penambahan fitur expor excel pada data presisi parawisata.
 15. [#923](https://github.com/OpenSID/OpenKab/issues/923) Penambahan fitur expor excel pada data presisi adat.
+16. [#922](https://github.com/OpenSID/OpenKab/issues/922) Penambahan expor excel pada data presisi agama.
 
 #### Perbaikan BUG
 
diff --git a/resources/views/components/excel-download-button.blade.php b/resources/views/components/excel-download-button.blade.php
index 232ec778..b687a1ab 100644
--- a/resources/views/components/excel-download-button.blade.php
+++ b/resources/views/components/excel-download-button.blade.php
@@ -80,7 +80,6 @@
                                 urlParams.append('{{ $param['key'] }}', '{{ $param['value'] }}');
                             @endforeach
                         @endif
-                        
                         if (tableId) {
                             // Get filter parameters from DataTable
                             const table = $('#' + tableId).DataTable();
diff --git a/resources/views/data_pokok/agama/index.blade.php b/resources/views/data_pokok/agama/index.blade.php
index 539c0b39..7099f2a4 100644
--- a/resources/views/data_pokok/agama/index.blade.php
+++ b/resources/views/data_pokok/agama/index.blade.php
@@ -30,22 +30,16 @@
             <div class="card card-outline card-primary">
                 <div class="card-header">
                     <div class="row">
-                        <div class="col-sm-2">
-                            <select id="filter-tahun" class="form-control form-control-sm">
-                                @php
-                                    $currentYear = date('Y');
-                                    $startYear = 2020;
-                                @endphp
-                                @for($year = $currentYear; $year >= $startYear; $year--)
-                                    <option value="{{ $year }}" {{ $year == $currentYear ? 'selected' : '' }}>{{ $year }}</option>
-                                @endfor
-                            </select>
-                        </div>
-                        <div class="col-sm-3">
-                            <button id="cetak" type="button" class="btn btn-primary btn-sm" data-url="">
-                                <i class="fa fa-print"></i> Cetak
-                            </button>
+                        <x-filter-tahun />
+                        <div class="col-auto">
+                            <x-print-button :print-url="route('cetak_agama')" table-id="agama" :filter="[]" />
                         </div>
+                        <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/data-presisi/agama/rtm/download'" table-id="agama" filename="data_presisi_agama"
+                            :additional-params="[
+                                ['key' => 'kode_kabupaten', 'value' => session('kabupaten.kode_kabupaten') ?? ''],
+                                ['key' => 'kode_kecamatan', 'value' => session('kecamatan.kode_kecamatan') ?? ''],
+                                ['key' => 'config_desa', 'value' => session('desa.id') ?? ''],
+                            ]" />
                     </div>
                 </div>
                 <div class="card-body">
@@ -101,10 +95,6 @@
                             "page[number]": (row.start / row.length) + 1,
                             'include': 'anggota,penduduk,rtm,keluarga',
                             "filter[search]": row.search.value,
-                            "filter[kepala_rtm]": true,
-                            // "sort": (row.order[0]?.dir === "asc" ? "" : "-") + row.columns[row.order[0]
-                            //         ?.column]
-                            //     ?.name,
                             "filter[kode_desa]": $("#kode_desa").val(),
                             "filter[tahun]": $("#filter-tahun").val(),
                         };
@@ -178,8 +168,8 @@ className: 'text-nowrap',
                                 "{{ route('detail_agama', ['data' => '__DATA__']) }}"
                                 .replace('__DATA__', jsonData)
                             return `<a href="${_url}" title="Detail" data-button="Detail">
-                                <button type="button" class="btn btn-info btn-sm">Detail</button>
-                            </a>`;
+                                    <button type="button" class="btn btn-info btn-sm">Detail</button>
+                                </a>`;
                         },
                         searchable: false,
                         orderable: false
@@ -237,37 +227,37 @@ className: 'text-nowrap',
 
             function format(data) {
                 return `
-                    <table class="table table-striped">
-                        <tr>
-                            <td><strong>DTKS:</strong></td>
-                            <td>${data.attributes.dtks || 'N/A'}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>Jumlah KK:</strong></td>
-                            <td>${data.attributes.jumlah_kk || 'N/A'}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>Alamat:</strong></td>
-                            <td>${data.attributes.alamat || 'N/A'}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>Dusun:</strong></td>
-                            <td>${data.attributes.dusun || 'N/A'}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>RT:</strong></td>
-                            <td>${data.attributes.rt || 'N/A'}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>RW:</strong></td>
-                            <td>${data.attributes.rw || 'N/A'}</td>
-                        </tr>
-                        <tr>
-                            <td><strong>Tanggal Terdaftar:</strong></td>
-                            <td>${data.attributes.tgl_daftar || 'N/A'}</td>
-                        </tr>
-                    </table>
-                `;
+                        <table class="table table-striped">
+                            <tr>
+                                <td><strong>DTKS:</strong></td>
+                                <td>${data.attributes.dtks || 'N/A'}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>Jumlah KK:</strong></td>
+                                <td>${data.attributes.jumlah_kk || 'N/A'}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>Alamat:</strong></td>
+                                <td>${data.attributes.alamat || 'N/A'}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>Dusun:</strong></td>
+                                <td>${data.attributes.dusun || 'N/A'}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>RT:</strong></td>
+                                <td>${data.attributes.rt || 'N/A'}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>RW:</strong></td>
+                                <td>${data.attributes.rw || 'N/A'}</td>
+                            </tr>
+                            <tr>
+                                <td><strong>Tanggal Terdaftar:</strong></td>
+                                <td>${data.attributes.tgl_daftar || 'N/A'}</td>
+                            </tr>
+                        </table>
+                    `;
             }
 
             $('#filter-tahun').on('change', function() {
@@ -275,13 +265,6 @@ function format(data) {
                 data_grafik = [];
                 grafikPie();
             });
-
-            $('#cetak').on('click', function() {
-                let baseUrl = "{{ route('cetak_agama') }}";
-                let params = agama.ajax.params(); // Get DataTables params
-                let queryString = new URLSearchParams(params).toString(); // Convert params to query string
-                window.open(`${baseUrl}?${queryString}`, '_blank'); // Open the URL with appended query
-            });
         })
     </script>
 @endsection