diff --git a/QueryTemplate/Daily/city_daily_2g.sql b/QueryTemplate/city_daily_2g.sql
similarity index 100%
rename from QueryTemplate/Daily/city_daily_2g.sql
rename to QueryTemplate/city_daily_2g.sql
diff --git a/QueryTemplate/Daily/city_daily_4g.sql b/QueryTemplate/city_daily_4g.sql
similarity index 98%
rename from QueryTemplate/Daily/city_daily_4g.sql
rename to QueryTemplate/city_daily_4g.sql
index 1e0b5dd..1d9e3dc 100644
--- a/QueryTemplate/Daily/city_daily_4g.sql
+++ b/QueryTemplate/city_daily_4g.sql
@@ -1,5 +1,5 @@
 with master as (select m.date
-                     , n.site_id
+                     , r.kota_kabupaten
 
                      , nds(sum(num_rrc_setup_sr), sum(denum_rrc_setup_sr))                                                                                           as rrc_setup_sr
                      , sum(num_rrc_setup_sr)                                                                                                                         as num_rrc_setup_sr
@@ -152,14 +152,15 @@ with master as (select m.date
 
                 from r11.meas_4g_daily m
                          join network_cell n on m.network_cell_id = n.id
+                         join ref_site r on n.site_id = r.site_id
 
                 where m.date between date_int(1) and date_int(1)
 --                   and n.region = 'PUMA'
-                  and n.site_id in ('AMB002')
+--                   and n.site_id in ('AMB002')
 
                 group by m.date
-                       , n.site_id)
+                       , r.kota_kabupaten)
 select *
 from master
-order by site_id, date
+order by kota_kabupaten, date
 ;
\ No newline at end of file
diff --git a/QueryTemplate/Daily/city_daily_5g.sql b/QueryTemplate/city_daily_5g.sql
similarity index 97%
rename from QueryTemplate/Daily/city_daily_5g.sql
rename to QueryTemplate/city_daily_5g.sql
index 9380a67..9de20e0 100644
--- a/QueryTemplate/Daily/city_daily_5g.sql
+++ b/QueryTemplate/city_daily_5g.sql
@@ -1,5 +1,5 @@
 with master as (select m.date
-                     , n.site_id
+                     , r.kota_kabupaten
 
                      , nds(sum(num_inter_handover_success_rate), sum(denum_inter_handover_success_rate))          as inter_handover_success_rate
                      , sum(number_of_sn_change_confirmations)                                                     as number_of_sn_change_confirmations
@@ -68,16 +68,16 @@ with master as (select m.date
                      , sum(number_of_bytes_of_ul_pdcp_services_mbyte)                                             as number_of_bytes_of_ul_pdcp_services_mbyte
                      , sum(number_of_bytes_of_dl_pdcp_services_mbyte)                                             as number_of_bytes_of_dl_pdcp_services_mbyte
 
-                from r11.meas_5g_hourly raw
+                from r11.meas_5g_daily m
                          join network_cell n on m.network_cell_id = n.id
+                         join ref_site r on n.site_id = r.site_id
 
                 where m.date between date_int(1) and date_int(1)
 --                   and n.region = 'PUMA'
-                  and n.site_id in ('AMB002')
+--                   and n.site_id in ('AMB002')
 
                 group by m.date
-                       , n.site_id)
+                       , r.kota_kabupaten)
 select *
 from master
-order by site_id, date
-;
\ No newline at end of file
+order by kota_kabupaten, date
\ No newline at end of file
diff --git a/QueryTemplate/Daily/site_daily_2g.sql b/QueryTemplate/site_daily_2g.sql
similarity index 100%
rename from QueryTemplate/Daily/site_daily_2g.sql
rename to QueryTemplate/site_daily_2g.sql
diff --git a/QueryTemplate/Daily/site_daily_4g.sql b/QueryTemplate/site_daily_4g.sql
similarity index 100%
rename from QueryTemplate/Daily/site_daily_4g.sql
rename to QueryTemplate/site_daily_4g.sql
diff --git a/QueryTemplate/Daily/site_daily_5g.sql b/QueryTemplate/site_daily_5g.sql
similarity index 99%
rename from QueryTemplate/Daily/site_daily_5g.sql
rename to QueryTemplate/site_daily_5g.sql
index 9380a67..f547071 100644
--- a/QueryTemplate/Daily/site_daily_5g.sql
+++ b/QueryTemplate/site_daily_5g.sql
@@ -68,12 +68,12 @@ with master as (select m.date
                      , sum(number_of_bytes_of_ul_pdcp_services_mbyte)                                             as number_of_bytes_of_ul_pdcp_services_mbyte
                      , sum(number_of_bytes_of_dl_pdcp_services_mbyte)                                             as number_of_bytes_of_dl_pdcp_services_mbyte
 
-                from r11.meas_5g_hourly raw
+                from r11.meas_5g_daily m
                          join network_cell n on m.network_cell_id = n.id
 
                 where m.date between date_int(1) and date_int(1)
 --                   and n.region = 'PUMA'
-                  and n.site_id in ('AMB002')
+--                   and n.site_id in ('AMB002')
 
                 group by m.date
                        , n.site_id)