diff --git a/backend/src/tasks/censys.ts b/backend/src/tasks/censys.ts
index d60aee050..83e92a922 100644
--- a/backend/src/tasks/censys.ts
+++ b/backend/src/tasks/censys.ts
@@ -82,10 +82,14 @@ export const handler = async (commandOptions: CommandOptions) => {
     for (const hit of data.result.hits) {
       if (!hit.names) continue;
       for (const name of hit.names) {
-        if (name.endsWith(rootDomain) && !uniqueNames.has(name)) {
-          uniqueNames.add(name);
+        const normalizedName = name.replace(/\*\.|^(www\.)/g, ''); // Remove www from beginning of name and wildcards from entire name
+        if (
+          normalizedName.endsWith(rootDomain) &&
+          !uniqueNames.has(normalizedName)
+        ) {
+          uniqueNames.add(normalizedName);
           foundDomains.add({
-            name: name.replace('*.', ''),
+            name: normalizedName,
             organization: { id: organizationId! },
             fromRootDomain: rootDomain,
             discoveredBy: { id: scanId }
diff --git a/backend/src/tasks/test/__snapshots__/censys.test.ts.snap b/backend/src/tasks/test/__snapshots__/censys.test.ts.snap
index 7040be9c7..9c19fede7 100644
--- a/backend/src/tasks/test/__snapshots__/censys.test.ts.snap
+++ b/backend/src/tasks/test/__snapshots__/censys.test.ts.snap
@@ -1,3 +1,18 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`censys basic test: helpers.saveDomainsToDb 1`] = `Array []`;
+exports[`censys basic test: helpers.saveDomainsToDb 1`] = `
+Array [
+  Domain {
+    "discoveredBy": Object {
+      "id": "ddf56d43-7f87-4139-9a86-b8a1ffde9b9e",
+    },
+    "fromRootDomain": "filedrop.cisa.gov",
+    "ip": "104.84.119.215",
+    "name": "filedrop.cisa.gov",
+    "organization": Object {
+      "id": "organizationId",
+    },
+    "subdomainSource": "censys",
+  },
+]
+`;
diff --git a/backend/src/tasks/test/censys.test.ts b/backend/src/tasks/test/censys.test.ts
index cc14b05da..631636a59 100644
--- a/backend/src/tasks/test/censys.test.ts
+++ b/backend/src/tasks/test/censys.test.ts
@@ -5,7 +5,7 @@ jest.mock('../helpers/saveDomainsToDb');
 
 jest.mock('dns', () => ({
   promises: {
-    lookup: async () => ({ address: '104.84.119.215' })
+    lookup: async (domainName) => ({ address: '104.84.119.215' })
   }
 }));
 
@@ -20,26 +20,1203 @@ describe('censys', () => {
         code: 200,
         status: 'OK',
         result: {
-          query: 'cisa.gov',
-          total: 5,
-          duration_ms: 91,
+          query: 'filedrop.cisa.gov',
+          total: 20,
+          duration_ms: 655,
           hits: [
             {
-              names: ['cisa.gov', 'www.cisa.gov', 'www2.dhs.gov']
+              names: [
+                'niem.gov',
+                'registration.fletc.gov',
+                'filedrop.cisa.gov',
+                'www.fema.org',
+                'e-verify.gov',
+                'www3.dhs.gov',
+                'globalentry.gov',
+                'scitech.dhs.gov',
+                'staging.cisa.gov',
+                'preview.cisa.gov',
+                'ice.gov',
+                'blog-es.uscis.gov',
+                'firstresponder.gov',
+                'www.cisa.gov',
+                'www.globalentry.gov',
+                'espfaq.fema.gov',
+                'schoolsafety.gov',
+                'www.schoolsafety.gov',
+                'floodsmart.gov',
+                'www.filedrop.cisa.gov',
+                'fleta.gov',
+                'blog.fema.gov',
+                'faq.ready.gov',
+                'www.fema.com',
+                'readybusiness.gov',
+                'cybersecurity.gov',
+                'fema.gov',
+                'tsa.gov',
+                'secretservice.gov',
+                'fema.org',
+                'www.cybersecurity.gov',
+                'cbp.dhs.gov',
+                'disasterassistance.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'cbp.gov',
+                'oig.dhs.gov',
+                'fletc.gov',
+                'fema.com',
+                'blog.uscis.gov',
+                'ready.gov',
+                'cyber.gov',
+                'uscis.gov',
+                'firstrespondertraining.gov',
+                'www.cyber.gov',
+                'listo.gov',
+                'cisa.gov',
+                'faq.fema.gov',
+                'everify.gov',
+                'biometrics.gov'
+              ]
+            },
+            {
+              names: [
+                'biometrics.cbp.gov',
+                'biometrics.gov',
+                'blog-es.uscis.gov',
+                'blog.fema.gov',
+                'blog.uscis.gov',
+                'cbp.dhs.gov',
+                'cbp.gov',
+                'cisa.gov',
+                'connect-presidentscup.cisa.gov',
+                'cyber.gov',
+                'cybersecurity.gov',
+                'disasterassistance.gov',
+                'e-verify.gov',
+                'engine-presidentscup.cisa.gov',
+                'espfaq.fema.gov',
+                'everify.gov',
+                'faq.fema.gov',
+                'faq.ready.gov',
+                'fema.com',
+                'fema.gov',
+                'fema.org',
+                'filedrop.cisa.gov',
+                'files-presidentscup.cisa.gov',
+                'firstresponder.gov',
+                'fleta.gov',
+                'fletc.gov',
+                'floodsmart.gov',
+                'globalentry.gov',
+                'ice.gov',
+                'id-presidentscup.cisa.gov',
+                'listo.gov',
+                'niem.gov',
+                'oig.dhs.gov',
+                'presidentscup.cisa.gov',
+                'preview-biometrics.cbp.gov',
+                'preview.cisa.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'ready.gov',
+                'readybusiness.gov',
+                'registration.fletc.gov',
+                'schoolsafety.gov',
+                'scitech.dhs.gov',
+                'secretservice.gov',
+                'solo-presidentscup.cisa.gov',
+                'staging.cisa.gov',
+                'team-presidentscup.cisa.gov',
+                'tsa.gov',
+                'us-cert.cisa.gov',
+                'uscis.gov',
+                'usss.gov',
+                'www.biometrics.cbp.gov',
+                'www.cisa.gov',
+                'www.cyber.gov',
+                'www.cybersecurity.gov',
+                'www.fema.com',
+                'www.fema.org',
+                'www.filedrop.cisa.gov',
+                'www.globalentry.gov',
+                'www.schoolsafety.gov',
+                'www.us-cert.cisa.gov',
+                'www.usss.gov',
+                'www3.dhs.gov'
+              ]
+            },
+            {
+              names: [
+                'biometrics.cbp.gov',
+                'biometrics.gov',
+                'blog-es.uscis.gov',
+                'blog.fema.gov',
+                'blog.uscis.gov',
+                'cbp.dhs.gov',
+                'cbp.gov',
+                'cisa.gov',
+                'connect-presidentscup.cisa.gov',
+                'cyber.gov',
+                'cybersecurity.gov',
+                'disasterassistance.gov',
+                'e-verify.gov',
+                'engine-presidentscup.cisa.gov',
+                'espfaq.fema.gov',
+                'everify.gov',
+                'faq.fema.gov',
+                'faq.ready.gov',
+                'fema.com',
+                'fema.gov',
+                'fema.org',
+                'filedrop.cisa.gov',
+                'files-presidentscup.cisa.gov',
+                'firstresponder.gov',
+                'firstrespondertraining.gov',
+                'fleta.gov',
+                'fletc.gov',
+                'floodsmart.gov',
+                'globalentry.gov',
+                'ice.gov',
+                'id-presidentscup.cisa.gov',
+                'listo.gov',
+                'niem.gov',
+                'oig.dhs.gov',
+                'presidentscup.cisa.gov',
+                'preview-biometrics.cbp.gov',
+                'preview.cisa.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'ready.gov',
+                'readybusiness.gov',
+                'registration.fletc.gov',
+                'schoolsafety.gov',
+                'scitech.dhs.gov',
+                'secretservice.gov',
+                'solo-presidentscup.cisa.gov',
+                'staging.cisa.gov',
+                'team-presidentscup.cisa.gov',
+                'tsa.gov',
+                'us-cert.cisa.gov',
+                'uscis.gov',
+                'usss.gov',
+                'www.biometrics.cbp.gov',
+                'www.cisa.gov',
+                'www.cyber.gov',
+                'www.cybersecurity.gov',
+                'www.fema.com',
+                'www.fema.org',
+                'www.filedrop.cisa.gov',
+                'www.globalentry.gov',
+                'www.schoolsafety.gov',
+                'www.us-cert.cisa.gov',
+                'www.usss.gov',
+                'www3.dhs.gov'
+              ]
+            },
+            {
+              names: [
+                'biometrics.cbp.gov',
+                'biometrics.gov',
+                'blog-es.uscis.gov',
+                'blog.fema.gov',
+                'blog.uscis.gov',
+                'cbp.dhs.gov',
+                'cbp.gov',
+                'cisa.gov',
+                'connect-presidentscup.cisa.gov',
+                'cyber.gov',
+                'cybersecurity.gov',
+                'disasterassistance.gov',
+                'e-verify.gov',
+                'engine-presidentscup.cisa.gov',
+                'espfaq.fema.gov',
+                'everify.gov',
+                'faq.fema.gov',
+                'faq.ready.gov',
+                'fema.com',
+                'fema.gov',
+                'fema.org',
+                'filedrop.cisa.gov',
+                'files-presidentscup.cisa.gov',
+                'firstresponder.gov',
+                'firstrespondertraining.gov',
+                'fleta.gov',
+                'fletc.gov',
+                'floodsmart.gov',
+                'globalentry.gov',
+                'ice.gov',
+                'id-presidentscup.cisa.gov',
+                'listo.gov',
+                'niem.gov',
+                'oig.dhs.gov',
+                'presidentscup.cisa.gov',
+                'preview-biometrics.cbp.gov',
+                'preview.cisa.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'ready.gov',
+                'readybusiness.gov',
+                'registration.fletc.gov',
+                'schoolsafety.gov',
+                'scitech.dhs.gov',
+                'secretservice.gov',
+                'solo-presidentscup.cisa.gov',
+                'staging.cisa.gov',
+                'team-presidentscup.cisa.gov',
+                'tsa.gov',
+                'us-cert.cisa.gov',
+                'uscis.gov',
+                'usss.gov',
+                'www.biometrics.cbp.gov',
+                'www.cisa.gov',
+                'www.cyber.gov',
+                'www.cybersecurity.gov',
+                'www.fema.com',
+                'www.fema.org',
+                'www.filedrop.cisa.gov',
+                'www.globalentry.gov',
+                'www.schoolsafety.gov',
+                'www.usss.gov',
+                'www3.dhs.gov'
+              ]
+            },
+            {
+              names: [
+                'biometrics.cbp.gov',
+                'biometrics.gov',
+                'blog-es.uscis.gov',
+                'blog.fema.gov',
+                'blog.uscis.gov',
+                'cbp.dhs.gov',
+                'cbp.gov',
+                'cisa.gov',
+                'connect-presidentscup.cisa.gov',
+                'cyber.gov',
+                'cybersecurity.gov',
+                'disasterassistance.gov',
+                'e-verify.gov',
+                'engine-presidentscup.cisa.gov',
+                'espfaq.fema.gov',
+                'everify.gov',
+                'faq.fema.gov',
+                'faq.ready.gov',
+                'fema.com',
+                'fema.gov',
+                'fema.org',
+                'filedrop.cisa.gov',
+                'files-presidentscup.cisa.gov',
+                'firstresponder.gov',
+                'fleta.gov',
+                'fletc.gov',
+                'floodsmart.gov',
+                'globalentry.gov',
+                'ice.gov',
+                'id-presidentscup.cisa.gov',
+                'listo.gov',
+                'niem.gov',
+                'oig.dhs.gov',
+                'presidentscup.cisa.gov',
+                'preview-biometrics.cbp.gov',
+                'preview.cisa.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'ready.gov',
+                'readybusiness.gov',
+                'registration.fletc.gov',
+                'schoolsafety.gov',
+                'scitech.dhs.gov',
+                'secretservice.gov',
+                'solo-presidentscup.cisa.gov',
+                'staging.cisa.gov',
+                'team-presidentscup.cisa.gov',
+                'tsa.gov',
+                'us-cert.cisa.gov',
+                'uscis.gov',
+                'usss.gov',
+                'www.biometrics.cbp.gov',
+                'www.cisa.gov',
+                'www.cyber.gov',
+                'www.cybersecurity.gov',
+                'www.fema.com',
+                'www.fema.org',
+                'www.filedrop.cisa.gov',
+                'www.globalentry.gov',
+                'www.schoolsafety.gov',
+                'www.us-cert.cisa.gov',
+                'www.usss.gov',
+                'www3.dhs.gov'
+              ]
+            },
+            {
+              names: [
+                'blog.fema.gov',
+                'readybusiness.gov',
+                'scitech.dhs.gov',
+                'e-verify.gov',
+                'listo.gov',
+                'firstresponder.gov',
+                'blog.uscis.gov',
+                'www.schoolsafety.gov',
+                'disasterassistance.gov',
+                'fema.org',
+                'public-prod-elis2.uscis.dhs.gov',
+                'ready.gov',
+                'www.cisa.gov',
+                'faq.ready.gov',
+                'ice.gov',
+                'filedrop.cisa.gov',
+                'everify.gov',
+                'niem.gov',
+                'floodsmart.gov',
+                'fema.com',
+                'cbp.dhs.gov',
+                'fleta.gov',
+                'fema.gov',
+                'espfaq.fema.gov',
+                'www.fema.org',
+                'blog-es.uscis.gov',
+                'www.globalentry.gov',
+                'oig.dhs.gov',
+                'biometrics.gov',
+                'staging.cisa.gov',
+                'fletc.gov',
+                'registration.fletc.gov',
+                'cbp.gov',
+                'www3.dhs.gov',
+                'tsa.gov',
+                'globalentry.gov',
+                'www.fema.com',
+                'secretservice.gov',
+                'schoolsafety.gov',
+                'uscis.gov',
+                'cisa.gov',
+                'firstrespondertraining.gov',
+                'www.filedrop.cisa.gov',
+                'preview.cisa.gov',
+                'faq.fema.gov'
+              ]
+            },
+            {
+              names: [
+                'readybusiness.gov',
+                'blog-es.uscis.gov',
+                'registration.fletc.gov',
+                'cbp.dhs.gov',
+                'faq.fema.gov',
+                'blog.uscis.gov',
+                'schoolsafety.gov',
+                'preview.cisa.gov',
+                'www.fema.org',
+                'disasterassistance.gov',
+                'niem.gov',
+                'tsa.gov',
+                'fema.com',
+                'cisa.gov',
+                'www3.dhs.gov',
+                'espfaq.fema.gov',
+                'fema.org',
+                'oig.dhs.gov',
+                'ready.gov',
+                'firstresponder.gov',
+                'secretservice.gov',
+                'www.cisa.gov',
+                'filedrop.cisa.gov',
+                'listo.gov',
+                'www.schoolsafety.gov',
+                'www.cyber.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'cyber.gov',
+                'scitech.dhs.gov',
+                'fleta.gov',
+                'firstrespondertraining.gov',
+                'staging.cisa.gov',
+                'www.globalentry.gov',
+                'everify.gov',
+                'ice.gov',
+                'fletc.gov',
+                'cbp.gov',
+                'globalentry.gov',
+                'www.fema.com',
+                'fema.gov',
+                'blog.fema.gov',
+                'www.cybersecurity.gov',
+                'e-verify.gov',
+                'floodsmart.gov',
+                'www.filedrop.cisa.gov',
+                'cybersecurity.gov',
+                'uscis.gov',
+                'faq.ready.gov',
+                'biometrics.gov'
+              ]
+            },
+            {
+              names: [
+                'www.fema.org',
+                'faq.ready.gov',
+                'schoolsafety.gov',
+                'tsa.gov',
+                'everify.gov',
+                'fleta.gov',
+                'e-verify.gov',
+                'listo.gov',
+                'www3.dhs.gov',
+                'blog-es.uscis.gov',
+                'blog.uscis.gov',
+                'blog.fema.gov',
+                'registration.fletc.gov',
+                'oig.dhs.gov',
+                'www.schoolsafety.gov',
+                'filedrop.cisa.gov',
+                'www.globalentry.gov',
+                'niem.gov',
+                'disasterassistance.gov',
+                'www.fema.com',
+                'ready.gov',
+                'staging.cisa.gov',
+                'uscis.gov',
+                'www.cisa.gov',
+                'firstresponder.gov',
+                'firstrespondertraining.gov',
+                'fletc.gov',
+                'scitech.dhs.gov',
+                'faq.fema.gov',
+                'fema.gov',
+                'fema.com',
+                'preview.cisa.gov',
+                'secretservice.gov',
+                'cbp.dhs.gov',
+                'espfaq.fema.gov',
+                'cisa.gov',
+                'floodsmart.gov',
+                'ice.gov',
+                'globalentry.gov',
+                'www.filedrop.cisa.gov',
+                'readybusiness.gov',
+                'cbp.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'fema.org',
+                'biometrics.gov'
+              ]
+            },
+            {
+              names: [
+                'e-verify.gov',
+                'floodsmart.gov',
+                'fema.gov',
+                'cbp.gov',
+                'fema.com',
+                'firstrespondertraining.gov',
+                'listo.gov',
+                'scitech.dhs.gov',
+                'firstresponder.gov',
+                'blog.fema.gov',
+                'fema.org',
+                'registration.fletc.gov',
+                'blog-es.uscis.gov',
+                'www.usss.gov',
+                'www.cyber.gov',
+                'niem.gov',
+                'tsa.gov',
+                'oig.dhs.gov',
+                'secretservice.gov',
+                'ice.gov',
+                'cbp.dhs.gov',
+                'ready.gov',
+                'preview.cisa.gov',
+                'usss.gov',
+                'faq.fema.gov',
+                'fleta.gov',
+                'www.filedrop.cisa.gov',
+                'www.globalentry.gov',
+                'fletc.gov',
+                'disasterassistance.gov',
+                'cisa.gov',
+                'cybersecurity.gov',
+                'uscis.gov',
+                'www.cisa.gov',
+                'schoolsafety.gov',
+                'staging.cisa.gov',
+                'faq.ready.gov',
+                'globalentry.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'cyber.gov',
+                'www.cybersecurity.gov',
+                'filedrop.cisa.gov',
+                'espfaq.fema.gov',
+                'readybusiness.gov',
+                'biometrics.gov',
+                'www3.dhs.gov',
+                'www.fema.org',
+                'www.fema.com',
+                'blog.uscis.gov',
+                'everify.gov',
+                'www.schoolsafety.gov'
+              ]
             },
             {
-              names: ['gwids.cisa.gov', 'www.gwids.cisa.gov']
+              names: [
+                'biometrics.cbp.gov',
+                'biometrics.gov',
+                'blog-es.uscis.gov',
+                'blog.fema.gov',
+                'blog.uscis.gov',
+                'cbp.dhs.gov',
+                'cbp.gov',
+                'cisa.gov',
+                'connect-presidentscup.cisa.gov',
+                'cyber.gov',
+                'cybersecurity.gov',
+                'disasterassistance.gov',
+                'e-verify.gov',
+                'engine-presidentscup.cisa.gov',
+                'espfaq.fema.gov',
+                'everify.gov',
+                'faq.fema.gov',
+                'faq.ready.gov',
+                'fema.com',
+                'fema.gov',
+                'fema.org',
+                'filedrop.cisa.gov',
+                'files-presidentscup.cisa.gov',
+                'firstresponder.gov',
+                'firstrespondertraining.gov',
+                'fleta.gov',
+                'fletc.gov',
+                'floodsmart.gov',
+                'globalentry.gov',
+                'ice.gov',
+                'id-presidentscup.cisa.gov',
+                'listo.gov',
+                'niem.gov',
+                'oig.dhs.gov',
+                'presidentscup.cisa.gov',
+                'preview-biometrics.cbp.gov',
+                'preview.cisa.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'ready.gov',
+                'readybusiness.gov',
+                'registration.fletc.gov',
+                'schoolsafety.gov',
+                'scitech.dhs.gov',
+                'secretservice.gov',
+                'solo-presidentscup.cisa.gov',
+                'staging.cisa.gov',
+                'team-presidentscup.cisa.gov',
+                'tsa.gov',
+                'us-cert.cisa.gov',
+                'uscis.gov',
+                'usss.gov',
+                'www.biometrics.cbp.gov',
+                'www.cisa.gov',
+                'www.cyber.gov',
+                'www.cybersecurity.gov',
+                'www.fema.com',
+                'www.fema.org',
+                'www.filedrop.cisa.gov',
+                'www.globalentry.gov',
+                'www.schoolsafety.gov',
+                'www.usss.gov',
+                'www3.dhs.gov'
+              ]
+            },
+            {
+              names: [
+                'solo-presidentscup.cisa.gov',
+                'presidentscup.cisa.gov',
+                'engine-presidentscup.cisa.gov',
+                'connect-presidentscup.cisa.gov',
+                'disasterassistance.gov',
+                'readybusiness.gov',
+                'www3.dhs.gov',
+                'www.cisa.gov',
+                'niem.gov',
+                'preview.cisa.gov',
+                'www.cybersecurity.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'blog-es.uscis.gov',
+                'cyber.gov',
+                'blog.uscis.gov',
+                'cybersecurity.gov',
+                'filedrop.cisa.gov',
+                'www.schoolsafety.gov',
+                'usss.gov',
+                'cbp.dhs.gov',
+                'tsa.gov',
+                'ice.gov',
+                'scitech.dhs.gov',
+                'secretservice.gov',
+                'team-presidentscup.cisa.gov',
+                'firstresponder.gov',
+                'biometrics.gov',
+                'fletc.gov',
+                'id-presidentscup.cisa.gov',
+                'ready.gov',
+                'globalentry.gov',
+                'www.globalentry.gov',
+                'e-verify.gov',
+                'staging.cisa.gov',
+                'firstrespondertraining.gov',
+                'faq.ready.gov',
+                'files-presidentscup.cisa.gov',
+                'schoolsafety.gov',
+                'oig.dhs.gov',
+                'cisa.gov',
+                'registration.fletc.gov',
+                'fema.com',
+                'cbp.gov',
+                'www.fema.com',
+                'fleta.gov',
+                'www.filedrop.cisa.gov',
+                'floodsmart.gov',
+                'www.cyber.gov',
+                'blog.fema.gov',
+                'www.fema.org',
+                'www.usss.gov',
+                'fema.gov',
+                'espfaq.fema.gov',
+                'uscis.gov',
+                'everify.gov',
+                'listo.gov',
+                'fema.org',
+                'faq.fema.gov'
+              ]
+            },
+            {
+              names: [
+                'biometrics.cbp.gov',
+                'biometrics.gov',
+                'blog-es.uscis.gov',
+                'blog.fema.gov',
+                'blog.uscis.gov',
+                'cbp.dhs.gov',
+                'cbp.gov',
+                'cisa.gov',
+                'connect-presidentscup.cisa.gov',
+                'cyber.gov',
+                'cybersecurity.gov',
+                'disasterassistance.gov',
+                'e-verify.gov',
+                'engine-presidentscup.cisa.gov',
+                'espfaq.fema.gov',
+                'everify.gov',
+                'faq.fema.gov',
+                'faq.ready.gov',
+                'fema.com',
+                'fema.gov',
+                'fema.org',
+                'filedrop.cisa.gov',
+                'files-presidentscup.cisa.gov',
+                'firstresponder.gov',
+                'firstrespondertraining.gov',
+                'fleta.gov',
+                'fletc.gov',
+                'floodsmart.gov',
+                'globalentry.gov',
+                'ice.gov',
+                'id-presidentscup.cisa.gov',
+                'listo.gov',
+                'niem.gov',
+                'oig.dhs.gov',
+                'presidentscup.cisa.gov',
+                'preview-biometrics.cbp.gov',
+                'preview.cisa.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'ready.gov',
+                'readybusiness.gov',
+                'registration.fletc.gov',
+                'schoolsafety.gov',
+                'scitech.dhs.gov',
+                'secretservice.gov',
+                'solo-presidentscup.cisa.gov',
+                'staging.cisa.gov',
+                'team-presidentscup.cisa.gov',
+                'tsa.gov',
+                'us-cert.cisa.gov',
+                'uscis.gov',
+                'usss.gov',
+                'www.biometrics.cbp.gov',
+                'www.cisa.gov',
+                'www.cyber.gov',
+                'www.cybersecurity.gov',
+                'www.fema.com',
+                'www.fema.org',
+                'www.filedrop.cisa.gov',
+                'www.globalentry.gov',
+                'www.schoolsafety.gov',
+                'www.usss.gov',
+                'www3.dhs.gov'
+              ]
+            },
+            {
+              names: [
+                'biometrics.cbp.gov',
+                'biometrics.gov',
+                'blog-es.uscis.gov',
+                'blog.fema.gov',
+                'blog.uscis.gov',
+                'cbp.dhs.gov',
+                'cbp.gov',
+                'cisa.gov',
+                'connect-presidentscup.cisa.gov',
+                'cyber.gov',
+                'cybersecurity.gov',
+                'disasterassistance.gov',
+                'e-verify.gov',
+                'engine-presidentscup.cisa.gov',
+                'espfaq.fema.gov',
+                'everify.gov',
+                'faq.fema.gov',
+                'faq.ready.gov',
+                'fema.com',
+                'fema.gov',
+                'fema.org',
+                'filedrop.cisa.gov',
+                'files-presidentscup.cisa.gov',
+                'firstresponder.gov',
+                'fleta.gov',
+                'fletc.gov',
+                'floodsmart.gov',
+                'globalentry.gov',
+                'ice.gov',
+                'id-presidentscup.cisa.gov',
+                'listo.gov',
+                'niem.gov',
+                'oig.dhs.gov',
+                'presidentscup.cisa.gov',
+                'preview-biometrics.cbp.gov',
+                'preview.cisa.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'ready.gov',
+                'readybusiness.gov',
+                'registration.fletc.gov',
+                'schoolsafety.gov',
+                'scitech.dhs.gov',
+                'secretservice.gov',
+                'solo-presidentscup.cisa.gov',
+                'staging.cisa.gov',
+                'team-presidentscup.cisa.gov',
+                'tsa.gov',
+                'us-cert.cisa.gov',
+                'uscis.gov',
+                'usss.gov',
+                'www.biometrics.cbp.gov',
+                'www.cisa.gov',
+                'www.cyber.gov',
+                'www.cybersecurity.gov',
+                'www.fema.com',
+                'www.fema.org',
+                'www.filedrop.cisa.gov',
+                'www.globalentry.gov',
+                'www.schoolsafety.gov',
+                'www.us-cert.cisa.gov',
+                'www.usss.gov',
+                'www3.dhs.gov'
+              ]
+            },
+            {
+              names: [
+                'biometrics.cbp.gov',
+                'biometrics.gov',
+                'blog-es.uscis.gov',
+                'blog.fema.gov',
+                'blog.uscis.gov',
+                'cbp.dhs.gov',
+                'cbp.gov',
+                'cisa.gov',
+                'connect-presidentscup.cisa.gov',
+                'cyber.gov',
+                'cybersecurity.gov',
+                'disasterassistance.gov',
+                'e-verify.gov',
+                'engine-presidentscup.cisa.gov',
+                'espfaq.fema.gov',
+                'everify.gov',
+                'faq.fema.gov',
+                'faq.ready.gov',
+                'fema.com',
+                'fema.gov',
+                'fema.org',
+                'filedrop.cisa.gov',
+                'files-presidentscup.cisa.gov',
+                'firstresponder.gov',
+                'firstrespondertraining.gov',
+                'fleta.gov',
+                'fletc.gov',
+                'floodsmart.gov',
+                'globalentry.gov',
+                'ice.gov',
+                'id-presidentscup.cisa.gov',
+                'listo.gov',
+                'niem.gov',
+                'oig.dhs.gov',
+                'presidentscup.cisa.gov',
+                'preview-biometrics.cbp.gov',
+                'preview.cisa.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'ready.gov',
+                'readybusiness.gov',
+                'registration.fletc.gov',
+                'schoolsafety.gov',
+                'scitech.dhs.gov',
+                'secretservice.gov',
+                'solo-presidentscup.cisa.gov',
+                'staging.cisa.gov',
+                'team-presidentscup.cisa.gov',
+                'tsa.gov',
+                'us-cert.cisa.gov',
+                'uscis.gov',
+                'usss.gov',
+                'www.biometrics.cbp.gov',
+                'www.cisa.gov',
+                'www.cyber.gov',
+                'www.cybersecurity.gov',
+                'www.fema.com',
+                'www.fema.org',
+                'www.filedrop.cisa.gov',
+                'www.globalentry.gov',
+                'www.schoolsafety.gov',
+                'www.us-cert.cisa.gov',
+                'www.usss.gov',
+                'www3.dhs.gov'
+              ]
             },
             {
-              names: ['certauth.fs.dhs.cisa.gov', 'fs.dhs.cisa.gov']
+              names: [
+                'biometrics.cbp.gov',
+                'biometrics.gov',
+                'blog-es.uscis.gov',
+                'blog.fema.gov',
+                'blog.uscis.gov',
+                'cbp.dhs.gov',
+                'cbp.gov',
+                'cisa.gov',
+                'connect-presidentscup.cisa.gov',
+                'cyber.gov',
+                'cybersecurity.gov',
+                'disasterassistance.gov',
+                'e-verify.gov',
+                'engine-presidentscup.cisa.gov',
+                'espfaq.fema.gov',
+                'everify.gov',
+                'faq.fema.gov',
+                'faq.ready.gov',
+                'fema.com',
+                'fema.gov',
+                'fema.org',
+                'filedrop.cisa.gov',
+                'files-presidentscup.cisa.gov',
+                'firstresponder.gov',
+                'firstrespondertraining.gov',
+                'fleta.gov',
+                'fletc.gov',
+                'floodsmart.gov',
+                'globalentry.gov',
+                'ice.gov',
+                'id-presidentscup.cisa.gov',
+                'listo.gov',
+                'niem.gov',
+                'oig.dhs.gov',
+                'presidentscup.cisa.gov',
+                'preview-biometrics.cbp.gov',
+                'preview.cisa.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'ready.gov',
+                'readybusiness.gov',
+                'registration.fletc.gov',
+                'schoolsafety.gov',
+                'scitech.dhs.gov',
+                'secretservice.gov',
+                'solo-presidentscup.cisa.gov',
+                'staging.cisa.gov',
+                'team-presidentscup.cisa.gov',
+                'tsa.gov',
+                'us-cert.cisa.gov',
+                'uscis.gov',
+                'usss.gov',
+                'www.biometrics.cbp.gov',
+                'www.cisa.gov',
+                'www.cyber.gov',
+                'www.cybersecurity.gov',
+                'www.fema.com',
+                'www.fema.org',
+                'www.filedrop.cisa.gov',
+                'www.globalentry.gov',
+                'www.schoolsafety.gov',
+                'www.us-cert.cisa.gov',
+                'www.usss.gov',
+                'www3.dhs.gov'
+              ]
             },
             {
-              names: ['origin-uat.gwids.cisa.gov', 'uat.gwids.cisa.gov']
+              names: [
+                'ice.gov',
+                'cybersecurity.gov',
+                'connect-presidentscup.cisa.gov',
+                'fema.com',
+                'www.fema.org',
+                'staging.cisa.gov',
+                'globalentry.gov',
+                'blog.fema.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'fema.org',
+                'www.cyber.gov',
+                'www.cybersecurity.gov',
+                'team-presidentscup.cisa.gov',
+                'faq.ready.gov',
+                'e-verify.gov',
+                'usss.gov',
+                'tsa.gov',
+                'cbp.dhs.gov',
+                'everify.gov',
+                'readybusiness.gov',
+                'www.schoolsafety.gov',
+                'biometrics.gov',
+                'blog-es.uscis.gov',
+                'scitech.dhs.gov',
+                'cbp.gov',
+                'blog.uscis.gov',
+                'fleta.gov',
+                'schoolsafety.gov',
+                'www.filedrop.cisa.gov',
+                'uscis.gov',
+                'secretservice.gov',
+                'firstresponder.gov',
+                'www3.dhs.gov',
+                'www.fema.com',
+                'espfaq.fema.gov',
+                'fema.gov',
+                'registration.fletc.gov',
+                'solo-presidentscup.cisa.gov',
+                'presidentscup.cisa.gov',
+                'id-presidentscup.cisa.gov',
+                'www.globalentry.gov',
+                'cisa.gov',
+                'filedrop.cisa.gov',
+                'floodsmart.gov',
+                'cyber.gov',
+                'listo.gov',
+                'preview.cisa.gov',
+                'ready.gov',
+                'files-presidentscup.cisa.gov',
+                'www.cisa.gov',
+                'firstrespondertraining.gov',
+                'oig.dhs.gov',
+                'faq.fema.gov',
+                'disasterassistance.gov',
+                'niem.gov',
+                'www.usss.gov',
+                'fletc.gov',
+                'engine-presidentscup.cisa.gov'
+              ]
+            },
+            {
+              names: [
+                'uscis.gov',
+                'www.filedrop.cisa.gov',
+                'listo.gov',
+                'fema.org',
+                'registration.fletc.gov',
+                'faq.fema.gov',
+                'fema.gov',
+                'biometrics.gov',
+                'www.schoolsafety.gov',
+                'team-presidentscup.cisa.gov',
+                'tsa.gov',
+                'cybersecurity.gov',
+                'faq.ready.gov',
+                'niem.gov',
+                'readybusiness.gov',
+                'floodsmart.gov',
+                'espfaq.fema.gov',
+                'filedrop.cisa.gov',
+                'ice.gov',
+                'fleta.gov',
+                'connect-presidentscup.cisa.gov',
+                'www.usss.gov',
+                'www.cyber.gov',
+                'blog.uscis.gov',
+                'www3.dhs.gov',
+                'www.fema.org',
+                'firstresponder.gov',
+                'secretservice.gov',
+                'blog.fema.gov',
+                'globalentry.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'cisa.gov',
+                'www.cybersecurity.gov',
+                'solo-presidentscup.cisa.gov',
+                'cbp.dhs.gov',
+                'scitech.dhs.gov',
+                'cbp.gov',
+                'disasterassistance.gov',
+                'e-verify.gov',
+                'fema.com',
+                'oig.dhs.gov',
+                'blog-es.uscis.gov',
+                'id-presidentscup.cisa.gov',
+                'fletc.gov',
+                'www.fema.com',
+                'everify.gov',
+                'engine-presidentscup.cisa.gov',
+                'usss.gov',
+                'firstrespondertraining.gov',
+                'www.globalentry.gov',
+                'ready.gov',
+                'schoolsafety.gov',
+                'presidentscup.cisa.gov',
+                'staging.cisa.gov',
+                'cyber.gov',
+                'files-presidentscup.cisa.gov',
+                'preview.cisa.gov',
+                'www.cisa.gov'
+              ]
+            },
+            {
+              names: [
+                'cisa.gov',
+                'cybersecurity.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'oig.dhs.gov',
+                'www.usss.gov',
+                'scitech.dhs.gov',
+                'cbp.gov',
+                'blog-es.uscis.gov',
+                'fema.gov',
+                'schoolsafety.gov',
+                'staging.cisa.gov',
+                'biometrics.gov',
+                'www.cyber.gov',
+                'www3.dhs.gov',
+                'www.globalentry.gov',
+                'blog.fema.gov',
+                'www.fema.com',
+                'secretservice.gov',
+                'registration.fletc.gov',
+                'faq.fema.gov',
+                'tsa.gov',
+                'www.filedrop.cisa.gov',
+                'preview.cisa.gov',
+                'firstresponder.gov',
+                'readybusiness.gov',
+                'firstrespondertraining.gov',
+                'fleta.gov',
+                'www.fema.org',
+                'fletc.gov',
+                'ready.gov',
+                'uscis.gov',
+                'filedrop.cisa.gov',
+                'disasterassistance.gov',
+                'www.schoolsafety.gov',
+                'listo.gov',
+                'everify.gov',
+                'cbp.dhs.gov',
+                'fema.org',
+                'espfaq.fema.gov',
+                'www.cisa.gov',
+                'e-verify.gov',
+                'faq.ready.gov',
+                'usss.gov',
+                'ice.gov',
+                'niem.gov',
+                'floodsmart.gov',
+                'globalentry.gov',
+                'blog.uscis.gov',
+                'cyber.gov',
+                'www.cybersecurity.gov',
+                'fema.com'
+              ]
+            },
+            {
+              names: [
+                'firstrespondertraining.gov',
+                'www3.dhs.gov',
+                'ready.gov',
+                'cisa.gov',
+                'globalentry.gov',
+                'secretservice.gov',
+                'cbp.dhs.gov',
+                'espfaq.fema.gov',
+                'fema.gov',
+                'fema.org',
+                'www.cisa.gov',
+                'blog-es.uscis.gov',
+                'staging.cisa.gov',
+                'niem.gov',
+                'registration.fletc.gov',
+                'faq.fema.gov',
+                'public-prod-elis2.uscis.dhs.gov',
+                'www.schoolsafety.gov',
+                'filedrop.cisa.gov',
+                'scitech.dhs.gov',
+                'www.fema.com',
+                'www.filedrop.cisa.gov',
+                'oig.dhs.gov',
+                'cbp.gov',
+                'preview.cisa.gov',
+                'fleta.gov',
+                'floodsmart.gov',
+                'tsa.gov',
+                'www.globalentry.gov',
+                'disasterassistance.gov',
+                'blog.uscis.gov',
+                'firstresponder.gov',
+                'listo.gov',
+                'faq.ready.gov',
+                'ice.gov',
+                'fletc.gov',
+                'www.fema.org',
+                'readybusiness.gov',
+                'schoolsafety.gov',
+                'biometrics.gov',
+                'fema.com',
+                'e-verify.gov',
+                'everify.gov',
+                'blog.fema.gov',
+                'uscis.gov'
+              ]
             },
             {
               names: [
-                'cybermarketplace.cisa.gov',
-                'staging-cybermarketplace.cisa.gov'
+                'floodsmart.gov',
+                'staging.cisa.gov',
+                'www.schoolsafety.gov',
+                'faq.ready.gov',
+                'uscis.gov',
+                'oig.dhs.gov',
+                'cisa.gov',
+                'secretservice.gov',
+                'cbp.dhs.gov',
+                'www3.dhs.gov',
+                'listo.gov',
+                'preview.cisa.gov',
+                'fleta.gov',
+                'www.fema.com',
+                'www.fema.org',
+                'schoolsafety.gov',
+                'blog-es.uscis.gov',
+                'tsa.gov',
+                'disasterassistance.gov',
+                'fema.org',
+                'firstrespondertraining.gov',
+                'www.cisa.gov',
+                'biometrics.gov',
+                'cbp.gov',
+                'filedrop.cisa.gov',
+                'scitech.dhs.gov',
+                'fema.gov',
+                'e-verify.gov',
+                'everify.gov',
+                'blog.fema.gov',
+                'www.globalentry.gov',
+                'globalentry.gov',
+                'registration.fletc.gov',
+                'espfaq.fema.gov',
+                'fema.com',
+                'ice.gov',
+                'blog.uscis.gov',
+                'ready.gov',
+                'www.filedrop.cisa.gov',
+                'fletc.gov',
+                'readybusiness.gov',
+                'firstresponder.gov',
+                'faq.fema.gov',
+                'niem.gov',
+                'public-prod-elis2.uscis.dhs.gov'
               ]
             }
           ],