diff --git a/.github/labeler-issue-triage.yml b/.github/labeler-issue-triage.yml
index ab3c8e3cd5c9..f04cd5c8c531 100644
--- a/.github/labeler-issue-triage.yml
+++ b/.github/labeler-issue-triage.yml
@@ -48,9 +48,6 @@ service/automation:
 service/azure-stack-hci:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_stack_hci_cluster((.|\n)*)###'
 
-service/azuremanagedlustrefilesystem:
-  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_managed_lustre_file_system((.|\n)*)###'
-
 service/batch:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_batch_((.|\n)*)###'
 
@@ -159,9 +156,6 @@ service/hdinsight:
 service/healthcare:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_healthcare_((.|\n)*)###'
 
-service/hpc-cache:
-  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_hpc_cache((.|\n)*)###'
-
 service/hsm:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_dedicated_hardware_security_module((.|\n)*)###'
 
diff --git a/.github/labeler-pull-request-triage.yml b/.github/labeler-pull-request-triage.yml
index bb6a4aa0650c..46c06b2981d2 100644
--- a/.github/labeler-pull-request-triage.yml
+++ b/.github/labeler-pull-request-triage.yml
@@ -49,9 +49,6 @@ service/automation:
 service/azure-stack-hci:
   - internal/services/azurestackhci/**/*
 
-service/azuremanagedlustrefilesystem:
-  - internal/services/azuremanagedlustrefilesystem/**/*
-
 service/batch:
   - internal/services/batch/**/*
 
@@ -161,9 +158,6 @@ service/hdinsight:
 service/healthcare:
   - internal/services/healthcare/**/*
 
-service/hpc-cache:
-  - internal/services/hpccache/**/*
-
 service/hsm:
   - internal/services/hsm/**/*
 
diff --git a/.teamcity/components/generated/services.kt b/.teamcity/components/generated/services.kt
index 345efa5d02bd..086857766ba2 100644
--- a/.teamcity/components/generated/services.kt
+++ b/.teamcity/components/generated/services.kt
@@ -16,7 +16,6 @@ var services = mapOf(
         "authorization" to "Authorization",
         "automanage" to "Automanage",
         "automation" to "Automation",
-        "azuremanagedlustrefilesystem" to "Azure Managed Lustre File System",
         "azurestackhci" to "Azure Stack HCI",
         "batch" to "Batch",
         "billing" to "Billing",
@@ -57,7 +56,6 @@ var services = mapOf(
         "frontdoor" to "FrontDoor",
         "graphservices" to "Graph Services",
         "hdinsight" to "HDInsight",
-        "hpccache" to "HPC Cache",
         "hsm" to "Hardware Security Module",
         "healthcare" to "Health Care",
         "hybridcompute" to "Hybrid Compute",
@@ -119,6 +117,7 @@ var services = mapOf(
         "signalr" to "SignalR",
         "springcloud" to "Spring Cloud",
         "storage" to "Storage",
+        "storagecache" to "Storage Cache",
         "storagemover" to "Storage Mover",
         "streamanalytics" to "Stream Analytics",
         "subscription" to "Subscription",