diff --git a/main.go b/main.go
index 11e7726..c51bff4 100644
--- a/main.go
+++ b/main.go
@@ -198,7 +198,7 @@ func main() {
 	queries := []PrometheusQueries{
 		{
 			Description: "APISERVER",
-			Query:       `avg(up{application="apiserver",cluster="` + cluster + `"})`,
+			Query:       `avg(up{job="kube-apiserver",cluster="` + cluster + `"})`,
 		},
 		{
 			Description: "CLUSTER",
diff --git a/main_test.go b/main_test.go
index 066843f..a2f4b77 100644
--- a/main_test.go
+++ b/main_test.go
@@ -404,7 +404,7 @@ func TestMainQueriesStructure(t *testing.T) {
         queries := []PrometheusQueries{
                 {
                         Description: "APISERVER",
-                        Query:       `avg(up{application="apiserver",cluster="` + cluster + `"})`,
+                        Query:       `avg(up{job="kube-apiserver",cluster="` + cluster + `"})`,
                 },
                 {
                         Description: "CLUSTER",