diff --git a/app/views/app_groups/_list.html.slim b/app/views/app_groups/_list.html.slim
index 259dd130..0f050e51 100644
--- a/app/views/app_groups/_list.html.slim
+++ b/app/views/app_groups/_list.html.slim
@@ -69,9 +69,12 @@ table.table.table-hover.table-sm
             br
         td.col-2 class="d-flex"
           - if policy(app_group).see_app_groups?
+            - location_name = app_group.kibana_helm_infrastructure&.infrastructure_location&.name
+            - override_map = ENV['BARITO_VIEWER_DOMAIN_OVERRIDED_MAP'].to_s.split(',').map { |pair| pair.split('=') }.to_h
+            - viewer_domain = override_map[location_name] || Figaro.env.viewer_domain
             .btn.btn-primary.btn-sm style="height: fit-content;"
               i.fas.fa-search.mr-1
-              = link_to 'Open Kibana', "#{Figaro.env.viewer_protocol}://#{Figaro.env.viewer_domain}/#{app_group.cluster_name}/", class: 'text-light', target: '_blank', rel: 'noopener noreferrer', style: 'text-decoration: none'
+              = link_to 'Open Kibana', "#{Figaro.env.viewer_protocol}://#{viewer_domain}/#{app_group.cluster_name}/", class: 'text-light', target: '_blank', rel: 'noopener noreferrer', style: 'text-decoration: none'
             = form_for(app_group, url: bookmark_app_group_path(app_group.id), method: :post, html: { class: 'ml-1' }) do |f|
               = hidden_field_tag(:app_group_id, app_group.id)
               = f.button class: 'btn btn-sm bg-transparent text-warning'
diff --git a/app/views/app_groups/show.html.slim b/app/views/app_groups/show.html.slim
index 985fabb5..d478d63f 100644
--- a/app/views/app_groups/show.html.slim
+++ b/app/views/app_groups/show.html.slim
@@ -120,9 +120,13 @@
                 = @labels['app-group'][label]
 
       .card-footer
+        - location_name = @app_group.kibana_helm_infrastructure&.infrastructure_location&.name
+        - override_map = ENV['BARITO_VIEWER_DOMAIN_OVERRIDED_MAP'].to_s.split(',').map { |pair| pair.split('=') }.to_h
+        - viewer_domain = override_map[location_name] || Figaro.env.viewer_domain
+
         .btn.btn-primary.btn-sm.mr-2
           i.fas.fa-search.mr-1
-          = link_to 'Open Kibana', @open_kibana_url, target: '_blank', rel: 'noopener noreferrer', class: 'text-light', style: 'text-decoration: none'
+          = link_to 'Open Kibana', "#{Figaro.env.viewer_protocol}://#{viewer_domain}/#{@app_group.cluster_name}/", target: '_blank', rel: 'noopener noreferrer', class: 'text-light', style: 'text-decoration: none'
         .btn.btn-primary.btn-sm.mr-2
           i.fas.fa-tachometer-alt.mr-1
           = link_to 'Monitoring', @open_katulampa_url, target: '_blank', rel: 'noopener noreferrer', class: 'text-light', style: 'text-decoration: none'