diff --git a/x-pack/plugins/apm/common/service_groups.ts b/x-pack/plugins/apm/common/service_groups.ts
index d56acc846dc1b..1fa6e03f43719 100644
--- a/x-pack/plugins/apm/common/service_groups.ts
+++ b/x-pack/plugins/apm/common/service_groups.ts
@@ -7,7 +7,7 @@
 
 export const APM_SERVICE_GROUP_SAVED_OBJECT_TYPE = 'apm-service-group';
 export const SERVICE_GROUP_COLOR_DEFAULT = '#D1DAE7';
-export const MAX_NUMBER_OF_SERVICES_IN_GROUP = 500;
+export const MAX_NUMBER_OF_SERVICE_GROUPS = 500;
 
 export interface ServiceGroup {
   groupName: string;
diff --git a/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts b/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts
index 6307d273e12f5..2e4690777d466 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts
@@ -10,7 +10,7 @@ import {
   ServiceGroup,
   SavedServiceGroup,
   APM_SERVICE_GROUP_SAVED_OBJECT_TYPE,
-  MAX_NUMBER_OF_SERVICES_IN_GROUP,
+  MAX_NUMBER_OF_SERVICE_GROUPS,
 } from '../../../common/service_groups';
 
 export async function getServiceGroups({
@@ -21,7 +21,7 @@ export async function getServiceGroups({
   const result = await savedObjectsClient.find<ServiceGroup>({
     type: APM_SERVICE_GROUP_SAVED_OBJECT_TYPE,
     page: 1,
-    perPage: MAX_NUMBER_OF_SERVICES_IN_GROUP,
+    perPage: MAX_NUMBER_OF_SERVICE_GROUPS,
   });
   return result.saved_objects.map(
     ({ id, attributes, updated_at: upatedAt }) => ({
diff --git a/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts b/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts
index a9b0d9fe8c57b..78b066a538699 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts
@@ -14,7 +14,7 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
-import { MAX_NUMBER_OF_SERVICES_IN_GROUP } from '../../../common/service_groups';
+import { MAX_NUMBER_OF_SERVICE_GROUPS } from '../../../common/service_groups';
 
 export async function lookupServices({
   setup,
@@ -49,7 +49,7 @@ export async function lookupServices({
         services: {
           terms: {
             field: SERVICE_NAME,
-            size: MAX_NUMBER_OF_SERVICES_IN_GROUP,
+            size: MAX_NUMBER_OF_SERVICE_GROUPS,
           },
           aggs: {
             environments: {
diff --git a/x-pack/plugins/apm/server/routes/services/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/routes/services/__snapshots__/queries.test.ts.snap
index e09c50708c476..8e2afb1bd1bf7 100644
--- a/x-pack/plugins/apm/server/routes/services/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/routes/services/__snapshots__/queries.test.ts.snap
@@ -126,7 +126,7 @@ Array [
               },
               "terms": Object {
                 "field": "service.name",
-                "size": 50,
+                "size": 500,
               },
             },
           },
@@ -186,7 +186,7 @@ Array [
               },
               "terms": Object {
                 "field": "service.name",
-                "size": 50,
+                "size": 500,
               },
             },
           },
diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_services_items.ts b/x-pack/plugins/apm/server/routes/services/get_services/get_services_items.ts
index a5936dd68d026..de484ed309884 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services/get_services_items.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services/get_services_items.ts
@@ -16,7 +16,7 @@ import { ServiceGroup } from '../../../../common/service_groups';
 
 export type ServicesItemsSetup = Setup;
 
-const MAX_NUMBER_OF_SERVICES = 50;
+const MAX_NUMBER_OF_SERVICES = 500;
 
 export async function getServicesItems({
   environment,