diff --git a/catatan_rilis.md b/catatan_rilis.md
index 8b92d8df..ac8b85bb 100644
--- a/catatan_rilis.md
+++ b/catatan_rilis.md
@@ -16,6 +16,7 @@ Di rilis ini, versi 2601.0.0 berisi penambahan dan perbaikan yang diminta penggu
 12. [#919](https://github.com/OpenSID/OpenKab/issues/919) Penambahan fitur expor excel pada data presisi infrastruktur.
 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.
 
 #### Perbaikan BUG
 
diff --git a/resources/views/data_pokok/data_presisi/adat/cetak.blade.php b/resources/views/data_pokok/data_presisi/adat/cetak.blade.php
index 5b693107..f9d56d7b 100644
--- a/resources/views/data_pokok/data_presisi/adat/cetak.blade.php
+++ b/resources/views/data_pokok/data_presisi/adat/cetak.blade.php
@@ -35,31 +35,20 @@
 
             const header = @include('layouts.components.header_bearer_api_gabungan');
             $.ajax({
-                url: `{{ config('app.databaseGabunganUrl') . '/api/v1/data-presisi/adat' }}?${filter}`,
+                url: `{{ config('app.databaseGabunganUrl') . '/api/v1/data-presisi/adat/rtm' }}?${filter}`,
                 headers: header,
                 method: 'get',
                 success: function(json) {
-                    var no = 1;
-                    // Transform the included array into an object
-                    const transformedIncluded = json.included.reduce((acc, item) => {
-                        if (!acc[item.type]) {
-                            acc[item.type] = {};
-                        }
-                        acc[item.type][item.id] = item.attributes;
-                        return acc;
-                    }, {});
+                    var no = 1;                    
                     json.data.forEach(function(item) {
                         var row = `
                             <tr>
                                 <td class="padat">${no}</td>
-                                <td>${transformedIncluded.penduduk[item
-                                    .relationships.penduduk.data.id].nik || 'N/A'}</td>
-                                <td>${transformedIncluded.penduduk[item
-                                    .relationships.penduduk.data.id].keluarga?.no_kk || 'N/A'}</td>
-                                <td>${transformedIncluded.penduduk[item
-                                    .relationships.penduduk.data.id].nama || 'N/A'}</td>
-                                <td>${item.attributes.agama || 'N/A'}</td>
-                                <td>${item.attributes.frekwensi || 'N/A'}</td>
+                                <td>${item.attributes.nik || 'N/A'}</td>
+                                <td>${item.attributes.kepala_keluarga || 'N/A'}</td>    
+                                <td>${item.attributes.jumlah_anggota || 'N/A'}</td>
+                                <td>${item.attributes.status_keanggotaan || 'N/A'}</td>
+                                <td>${item.attributes.frekwensi_mengikuti_kegiatan_setahun || 'N/A'}</td>
                             </tr>
                             `
                         $('#tabel-adat tbody').append(row)
diff --git a/resources/views/data_pokok/data_presisi/adat/index.blade.php b/resources/views/data_pokok/data_presisi/adat/index.blade.php
index a6314b44..857f8a38 100644
--- a/resources/views/data_pokok/data_presisi/adat/index.blade.php
+++ b/resources/views/data_pokok/data_presisi/adat/index.blade.php
@@ -5,241 +5,184 @@
 @section('title', 'Data adat')
 
 @section('content_header')
-    <h1>{{ $title }}</h1>
+<h1>{{ $title }}</h1>
 @stop
 
 @section('content')
-    @include('partials.breadcrumbs')
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="card">
-                <div class="card-header">Statistik Adat</div>
-                <div class="card-body">
-                    <div>
-                        <div class="chart" id="pie1">
+@include('partials.breadcrumbs')
+<div class="row">
+    <div class="col-lg-12">
+        <div class="card">
+            <div class="card-header">Statistik Adat</div>
+            <div class="card-body">
+                <div>
+                    <div class="chart" id="pie1">
 
-                        </div>
-                        <hr class="hr-chart">
                     </div>
+                    <hr class="hr-chart">
                 </div>
             </div>
         </div>
     </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <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>
-                        </div>
+</div>
+<div class="row">
+    <div class="col-lg-12">
+        <div class="card card-outline card-primary">
+            <div class="card-header">
+                <div class="row mb-2">
+                    <x-filter-tahun />
+                    <div class="col-auto">
+                        <x-print-button :print-url="url('data-pokok/data-presisi-adat/cetak')" table-id="adat" :filter="[]" />
                     </div>
+                    <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/data-presisi/adat/rtm/download'" table-id="adat" filename="data_adat" />
                 </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table class="table table-striped" id="adat">
-                            <thead>
-                                <tr>
-                                    <th>Aksi</th>
-                                    <th>#</th>
-                                    <th>NIK</th>
-                                    <th>Nama Kepala Keluarga</th>
-                                    <th>Jumlah Anggota RTM</th>
-                                    <th>Status Keanggotaan</th>
-                                    <th>Frekwensi Mengikuti Kegiatan Adat Dalam Setahun</th>
-                                </tr>
-                            </thead>
-                            <tbody></tbody>
-                        </table>
-                    </div>
+            </div>
+            <div class="card-body">
+                <div class="table-responsive">
+                    <table class="table table-striped" id="adat">
+                        <thead>
+                            <tr>
+                                <th>Aksi</th>
+                                <th>#</th>
+                                <th>NIK</th>
+                                <th>Nama Kepala Keluarga</th>
+                                <th>Jumlah Anggota RTM</th>
+                                <th>Status Keanggotaan</th>
+                                <th>Frekwensi Mengikuti Kegiatan Adat Dalam Setahun</th>
+                            </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
                 </div>
             </div>
         </div>
     </div>
+</div>
 @endsection
 
 @section('js')
 @include('data_pokok.data_presisi.adat.chart')
-    <script nonce="{{ csp_nonce() }}">
-        let data_grafik = [];
-        let transformedIncluded = {};
-        document.addEventListener("DOMContentLoaded", function(event) {
-            const header = @include('layouts.components.header_bearer_api_gabungan');
-            var url = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/data-presisi/adat' }}");
-            url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
-            url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
-            url.searchParams.set("config_desa", "{{ session('desa.id') ?? '' }}");
-            var adat = $('#adat').DataTable({
-                processing: true,
-                serverSide: true,
-                autoWidth: false,
-                ordering: false,
-                searchPanes: {
-                    viewTotal: false,
-                    columns: [0]
+<script nonce="{{ csp_nonce() }}">
+    let data_grafik = [];
+    let transformedIncluded = {};
+    document.addEventListener("DOMContentLoaded", function(event) {
+        const header = @include('layouts.components.header_bearer_api_gabungan');
+        var url = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/data-presisi/adat/rtm' }}");
+        url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
+        url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
+        url.searchParams.set("config_desa", "{{ session('desa.id') ?? '' }}");
+        var adat = $('#adat').DataTable({
+            processing: true,
+            serverSide: true,
+            autoWidth: false,
+            ordering: false,
+            searchPanes: {
+                viewTotal: false,
+                columns: [0]
+            },
+            ajax: {
+                url: url.href,
+                headers: header,
+                method: 'get',
+                data: function(row) {
+                    return {
+                        "page[size]": row.length,
+                        "page[number]": (row.start / row.length) + 1,                        
+                        "filter[search]": row.search.value,                        
+                        "sort": "id",                        
+                        "filter[tahun]": $('#filter-tahun').val(),
+                    };
                 },
-                ajax: {
-                    url: url.href,
-                    headers: header,
-                    method: 'get',
-                    data: function(row) {
-                        return {
-                            "page[size]": row.length,
-                            "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(),
-                        };
-                    },
-                    dataSrc: function(json) {
-
-                        if (json.data.length > 0) {
-                            json.recordsTotal = json.meta.pagination.total
-                            json.recordsFiltered = json.meta.pagination.total
-                            data_grafik = [];
-                            // Transform the included array into an object
-                            transformedIncluded = json.included.reduce((acc, item) => {
-                                if (!acc[item.type]) {
-                                    acc[item.type] = {};
-                                }
-                                acc[item.type][item.id] = item.attributes;
-                                return acc;
-                            }, {});
-
-                            json.data.forEach(function(item, index) {
-                                data_grafik.push(item.attributes)
-                                item.attributes.nik = transformedIncluded.penduduk[item
-                                    .relationships.penduduk.data.id].nik;
-                                item.attributes.nama = transformedIncluded.penduduk[item
-                                    .relationships.penduduk.data.id].nama;
-                                if (!item.attributes.frekwensi) {
-                                    item.attributes.frekwensi = 'TIDAK TAHU'
-                                }
-                                if (!item.attributes.status_keanggotaan) {
-                                    item.attributes.status_keanggotaan = 'TIDAK TAHU'
-                                }
-                                item.attributes.dtks = transformedIncluded.rtm[item
-                                        .relationships.rtm.data.id].dtks ? 'Terdaftar' :
-                                    'Tidak Terdaftar';
-                                item.attributes.tgl_daftar = transformedIncluded.rtm[item
-                                    .relationships.rtm.data.id].tgl_daftar;
-                                item.attributes.jumlah_kk = transformedIncluded.rtm[item
-                                    .relationships.rtm.data.id].jumlah_kk;
-                                item.attributes.alamat = transformedIncluded.keluarga[item
-                                    .relationships.keluarga.data.id].alamat;
-                                item.attributes.dusun = transformedIncluded.keluarga[item
-                                    .relationships.keluarga.data.id].wilayah?.dusun;
-                                item.attributes.rt = transformedIncluded.keluarga[item
-                                    .relationships.keluarga.data.id].wilayah?.rt;
-                                item.attributes.rw = transformedIncluded.keluarga[item
-                                    .relationships.keluarga.data.id].wilayah?.rw;
-                            })
-                            grafikPie()
-                            return json.data;
-                        }
-                        return false;
-                    },
+                dataSrc: function(json) {
+                    json.recordsTotal = json.meta?.pagination?.total || 0
+                    json.recordsFiltered = json.meta?.pagination?.total || 0
+                    if (json.data.length > 0) {                        
+                        data_grafik = [];
+                        json.data.forEach(function(item, index) {
+                            data_grafik.push(item.attributes)
+                        })                        
+                        grafikPie()
+                        return json.data;
+                    }
+                    return false;
                 },
-                columnDefs: [{
-                    targets: '_all',
-                    className: 'text-nowrap',
-                }, ],
-                columns: [{
-                        data: function(data) {
-                            let d = data.attributes
-                            let obj = {
-                                'rtm_id': data.relationships.rtm.data.id,
-                                'no_kartu_rumah': transformedIncluded.rtm[data.relationships.rtm
-                                    .data.id].no_kk,
-                                'nama_kepala_keluarga': d.nama,
-                                'alamat': transformedIncluded.keluarga[data.relationships
-                                    .keluarga.data.id].alamat,
-                                'jumlah_anggota': d.anggota_count,
-                                'jumlah_kk': transformedIncluded.rtm[data.relationships.rtm
-                                    .data.id].jumlah_kk,
-                            }
-                            let jsonData = encodeURIComponent(JSON.stringify(obj));
-                            const _url =
-                                "{{ route('data-pokok.data-presisi-adat.detail', ['data' => '__DATA__']) }}"
-                                .replace('__DATA__', jsonData)
-                            return `<a href="${_url}" title="Detail" data-button="Detail">
+            },
+            columnDefs: [{
+                targets: '_all',
+                className: 'text-nowrap',
+            }, ],
+            columns: [{
+                    data: function(data) {
+                        let d = data.attributes
+                         let obj = {
+                            'rtm_id': data.id,
+                            'no_kartu_rumah': d.no_kk,
+                            'nama_kepala_keluarga': d.kepala_keluarga,
+                            'alamat': d.alamat,
+                            'jumlah_anggota': d.jumlah_anggota,
+                            'jumlah_kk': d.jumlah_kk,
+                        }
+                        let jsonData = encodeURIComponent(JSON.stringify(obj));
+                        const _url =
+                            "{{ route('data-pokok.data-presisi-adat.detail', ['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>`;
-                        },
-                        searchable: false,
-                        orderable: false
-                    },
-                    {
-                        "className": 'details-control',
-                        "orderable": false,
-                        "data": null,
-                        "defaultContent": ''
-                    },
-                    {
-                        data: "attributes.nik",
-                        name: "penduduk.nik",
-                    },
-                    {
-                        data: "attributes.nama",
-                        name: "rtm.nama_kepala_keluarga",
-                        orderable: false
-                    },
-                    {
-                        data: "attributes.anggota_count",
-                        name: null,
-                        orderable: false,
-                        searchable: false
-                    },
-                    {
-                        data: "attributes.status_keanggotaan",
-                        name: "status_keanggotaan",
-                        orderable: false,
-                        searchable: false
                     },
-                    {
-                        data: "attributes.frekwensi",
-                        name: "frekwensi_mengikuti_kegiatan_setahun",
-                        orderable: false,
-                        searchable: false
-                    },
-                ],
-            })
+                    searchable: false,
+                    orderable: false
+                },
+                {
+                    "className": 'details-control',
+                    "orderable": false,
+                    "data": null,
+                    "defaultContent": ''
+                },
+                {
+                    data: "attributes.nik",
+                    orderable: false,
+                },
+                {
+                    data: "attributes.kepala_keluarga",
+                    orderable: false,
+                },
+                {
+                    data: "attributes.jumlah_anggota",
+                    orderable: false,
+                },
+                {
+                    data: "attributes.status_keanggotaan",
+                    name: "status_keanggotaan",
+                    orderable: false,
+                    searchable: false
+                },
+                {
+                    data: "attributes.frekwensi_mengikuti_kegiatan_setahun",
+                    name: "frekwensi_mengikuti_kegiatan_setahun",
+                    orderable: false,
+                    searchable: false
+                },
+            ],
+        })
 
-            // Add event listener for opening and closing details
-            adat.on('click', 'td.details-control', function() {
-                let tr = $(this).closest('tr');
-                let row = adat.row(tr);
-                if (row.child.isShown()) {
-                    // This row is already open - close it
-                    row.child.hide();
-                    tr.removeClass('shown');
-                } else {
-                    // Open this row
-                    row.child(format(row.data())).show();
-                    tr.addClass('shown');
-                }
-            });
+        // Add event listener for opening and closing details
+        adat.on('click', 'td.details-control', function() {
+            let tr = $(this).closest('tr');
+            let row = adat.row(tr);
+            if (row.child.isShown()) {
+                // This row is already open - close it
+                row.child.hide();
+                tr.removeClass('shown');
+            } else {
+                // Open this row
+                row.child(format(row.data())).show();
+                tr.addClass('shown');
+            }
+        });
 
-            function format(data) {
-                return `
+        function format(data) {
+            return `
                     <table class="table table-striped">
                         <tr>
                             <td><strong>DTKS:</strong></td>
@@ -271,20 +214,13 @@ function format(data) {
                         </tr>
                     </table>
                 `;
-            }
-            // Event listener for year filter change
-            $('#filter-tahun').on('change', function() {
-                adat.ajax.reload();
-                data_grafik = [];
-                grafikPie();
-            });
-            
-            $('#cetak').on('click', function() {
-                let baseUrl = "{{ route('data-pokok.data-presisi-adat.cetak') }}";
-                let params = adat.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
+        }
+        // Event listener for year filter change
+        $('#filter-tahun').on('change', function() {
+            adat.ajax.reload();
+            data_grafik = [];
+            grafikPie();
+        });
+    })
+</script>
+@endsection
\ No newline at end of file
diff --git a/tests/Feature/FilterTahunTest.php b/tests/Feature/FilterTahunTest.php
index ad389945..2e11545f 100644
--- a/tests/Feature/FilterTahunTest.php
+++ b/tests/Feature/FilterTahunTest.php
@@ -20,8 +20,9 @@ public function test_filter_tahun_basic_functionality()
         // Test ada elemen filter tahun
         $response->assertSee('filter-tahun');
 
-        // Test ada tahun minimal 2020
-        $response->assertSee('2020');
+        // Test ada tahun minimal (tahun sekarang - 5)
+        $minYear = date('Y') - 5;
+        $response->assertSee((string)$minYear);
 
         // Test ada tahun sekarang
         $response->assertSee(date('Y'));
@@ -52,20 +53,21 @@ public function test_filter_tahun_html_structure()
     }
 
     /**
-     * Test year range is correct (2020 to current year)
+     * Test year range is correct (current year to 5 years back)
      */
     public function test_year_range_functionality()
     {
         $currentYear = date('Y');
+        $startYear = $currentYear - 5;
         $response = $this->get('/data-presisi/adat');
 
         $response->assertStatus(200);
 
-        // Test range tahun dari 2020 sampai tahun sekarang
-        $response->assertSee('2020');
+        // Test range tahun dari tahun sekarang - 5 sampai tahun sekarang
+        $response->assertSee((string)$startYear);
         $response->assertSee($currentYear);
 
-        $this->assertTrue(true, 'Range tahun filter sesuai (2020-' . $currentYear . ')');
+        $this->assertTrue(true, 'Range tahun filter sesuai (' . $startYear . '-' . $currentYear . ')');
     }
 
     /**