diff --git a/entity-types/infra-gcpvertexaiendpoint/golden_metrics.yml b/entity-types/infra-gcpaiplatformendpoint/golden_metrics.yml
similarity index 100%
rename from entity-types/infra-gcpvertexaiendpoint/golden_metrics.yml
rename to entity-types/infra-gcpaiplatformendpoint/golden_metrics.yml
diff --git a/entity-types/infra-gcpvertexaiendpoint/summary_metrics.yml b/entity-types/infra-gcpaiplatformendpoint/summary_metrics.yml
similarity index 100%
rename from entity-types/infra-gcpvertexaiendpoint/summary_metrics.yml
rename to entity-types/infra-gcpaiplatformendpoint/summary_metrics.yml
diff --git a/entity-types/infra-gcpvertexaifeaturestore/golden_metrics.yml b/entity-types/infra-gcpaiplatformfeaturestore/golden_metrics.yml
similarity index 100%
rename from entity-types/infra-gcpvertexaifeaturestore/golden_metrics.yml
rename to entity-types/infra-gcpaiplatformfeaturestore/golden_metrics.yml
diff --git a/entity-types/infra-gcpvertexaifeaturestore/summary_metrics.yml b/entity-types/infra-gcpaiplatformfeaturestore/summary_metrics.yml
similarity index 100%
rename from entity-types/infra-gcpvertexaifeaturestore/summary_metrics.yml
rename to entity-types/infra-gcpaiplatformfeaturestore/summary_metrics.yml
diff --git a/entity-types/infra-gcpvertexaiendpoint/definition.yml b/entity-types/infra-gcpvertexaiendpoint/definition.yml
deleted file mode 100644
index 0558214b9..000000000
--- a/entity-types/infra-gcpvertexaiendpoint/definition.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-domain: INFRA
-type: GCPVERTEXAIENDPOINT
-goldenTags:
-- providerExternalId
-- location
-configuration:
-  entityExpirationTime: DAILY
-  alertable: true
diff --git a/entity-types/infra-gcpvertexaifeaturestore/definition.yml b/entity-types/infra-gcpvertexaifeaturestore/definition.yml
deleted file mode 100644
index 244a601b6..000000000
--- a/entity-types/infra-gcpvertexaifeaturestore/definition.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-domain: INFRA
-type: GCPVERTEXAIFEATURESTORE
-goldenTags:
-- providerExternalId
-- location
-configuration:
-  entityExpirationTime: DAILY
-  alertable: true
\ No newline at end of file