diff --git a/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.ts
index 77e5e222dc..826ce39a6c 100644
--- a/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.ts
@@ -26,6 +26,8 @@ import { CatalogProcessor, CatalogProcessorEmit } from './types';
 const AWS_ORGANIZATION_REGION = 'us-east-1';
 const LOCATION_TYPE = 'aws-cloud-accounts';
 
+const ORGANIZATION_ANNOTATION = 'amazonaws.com/organization-id';
+
 /**
  * A processor for ingesting AWS Accounts from AWS Organizations.
  *
@@ -110,6 +112,18 @@ export class AwsOrganizationCloudAccountProcessor implements CatalogProcessor {
 
     (await this.getAwsAccounts())
       .map(account => this.mapAccountToComponent(account))
+      .filter(entity => {
+        if (location.target !== '') {
+          if (entity.metadata.annotations) {
+            return (
+              entity.metadata.annotations[ORGANIZATION_ANNOTATION] ===
+              location.type
+            );
+          }
+          return false;
+        }
+        return true;
+      })
       .forEach((entity: ComponentEntityV1alpha1) => {
         emit(results.entity(location, entity));
       });
diff --git a/plugins/catalog-backend/src/ingestion/processors/index.ts b/plugins/catalog-backend/src/ingestion/processors/index.ts
index 5574b05bc0..a7b00d7065 100644
--- a/plugins/catalog-backend/src/ingestion/processors/index.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/index.ts
@@ -17,7 +17,7 @@
 import * as results from './results';
 
 export { AnnotateLocationEntityProcessor } from './AnnotateLocationEntityProcessor';
-export { AwsOrganizationProcessor } from './AwsOrganizationCloudAccountProcessor';
+export { AwsOrganizationCloudAccountProcessor } from './AwsOrganizationCloudAccountProcessor';
 export { BuiltinKindsEntityProcessor } from './BuiltinKindsEntityProcessor';
 export { CodeOwnersProcessor } from './CodeOwnersProcessor';
 export { FileReaderProcessor } from './FileReaderProcessor';