diff --git a/app/server/app/public/data/config/services-attains.json b/app/server/app/public/data/config/services-attains.json
index 003fea71c..f88efab51 100644
--- a/app/server/app/public/data/config/services-attains.json
+++ b/app/server/app/public/data/config/services-attains.json
@@ -197,6 +197,11 @@
       "wildcardUrl": "{urlLookup}*",
       "name": "grts - state water stories"
     },
+    {
+      "urlLookup": "grts.getSSByHUC12",
+      "wildcardUrl": "{urlLookup}*",
+      "name": "grts - huc12 water stories"
+    },
     {
       "urlLookup": "dwmaps.getGPRASummary",
       "wildcardUrl": "{urlLookup}*",
@@ -229,10 +234,9 @@
     },
     {
       "urlLookup": "waterQualityPortal.domainValues",
-      "wildcardUrl": "{urlLookup}/*?mimeType=json",
+      "wildcardUrl": "{urlLookup}/*",
       "name": "wqp - domain values"
     },
-
     {
       "urlLookup": "waterQualityPortal.monitoringLocation",
       "wildcardUrl": "{urlLookup}search?mimeType=geojson&zip=no&huc=*",
@@ -240,7 +244,7 @@
     },
     {
       "urlLookup": "waterQualityPortal.monitoringLocation",
-      "wildcardUrl": "{urlLookup}search?mimeType=geojson&zip=no&siteid=*",
+      "wildcardUrl": "{urlLookup}search?mimeType=geojson&zip=no&*siteid=*",
       "name": "wqp - monitoring location site specific data"
     },
     {
@@ -278,6 +282,66 @@
       "wildcardUrl": "{urlLookup}*",
       "name": "fishing info"
     },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/dataPage.json",
+      "name": "s3 lookup - data page"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/educators.json",
+      "name": "s3 lookup - educators page"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/attains/impairmentFields.json",
+      "name": "s3 lookup - attains impairment fields"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/attains/parameters.json",
+      "name": "s3 lookup - attains parameters"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/attains/useFields.json",
+      "name": "s3 lookup - attains use fields"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/cache/glossary.json",
+      "name": "s3 lookup - glossary"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/community/characteristicGroupMappings.json",
+      "name": "s3 lookup - community characteristic group mappings"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/community/usgs-sta-parameters.json",
+      "name": "s3 lookup - community usgs sta parameters"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/community/cyan-metadata.json",
+      "name": "s3 lookup - community cyan metadata"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/community/extreme-weather.json",
+      "name": "s3 lookup - community extreme weather"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/config/layerProps.json",
+      "name": "s3 lookup - config layer props"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/config/services.json",
+      "name": "s3 lookup - config services"
+    },
     {
       "urlLookup": "origin",
       "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/national/NARS.json",
@@ -313,6 +377,11 @@
       "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/state/waterTypeOptions.json",
       "name": "s3 lookup - state waterTypeOptions"
     },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/tribe/tribeMapping.json",
+      "name": "s3 lookup - tribe mapping"
+    },
     {
       "urlLookup": "waterbodyService.summary",
       "wildcardUrl": "{urlLookup}?f=json",
@@ -338,6 +407,11 @@
       "wildcardUrl": "{urlLookup}*",
       "name": "Attains_Assessment - map server (summary table)"
     },
+    {
+      "urlLookup": "waterbodyService.controlTable",
+      "wildcardUrl": "{urlLookup}*",
+      "name": "Attains_Assessment - map server (control table)"
+    },
     {
       "urlLookup": "wbd",
       "wildcardUrl": "{urlLookup}*",
diff --git a/app/server/app/public/data/config/services.json b/app/server/app/public/data/config/services.json
index a9e310114..df984a1e1 100644
--- a/app/server/app/public/data/config/services.json
+++ b/app/server/app/public/data/config/services.json
@@ -197,6 +197,11 @@
       "wildcardUrl": "{urlLookup}*",
       "name": "grts - state water stories"
     },
+    {
+      "urlLookup": "grts.getSSByHUC12",
+      "wildcardUrl": "{urlLookup}*",
+      "name": "grts - huc12 water stories"
+    },
     {
       "urlLookup": "dwmaps.getGPRASummary",
       "wildcardUrl": "{urlLookup}*",
@@ -229,10 +234,9 @@
     },
     {
       "urlLookup": "waterQualityPortal.domainValues",
-      "wildcardUrl": "{urlLookup}/*?mimeType=json",
+      "wildcardUrl": "{urlLookup}/*",
       "name": "wqp - domain values"
     },
-
     {
       "urlLookup": "waterQualityPortal.monitoringLocation",
       "wildcardUrl": "{urlLookup}search?mimeType=geojson&zip=no&huc=*",
@@ -240,7 +244,7 @@
     },
     {
       "urlLookup": "waterQualityPortal.monitoringLocation",
-      "wildcardUrl": "{urlLookup}search?mimeType=geojson&zip=no&siteid=*",
+      "wildcardUrl": "{urlLookup}search?mimeType=geojson&zip=no&*siteid=*",
       "name": "wqp - monitoring location site specific data"
     },
     {
@@ -278,6 +282,66 @@
       "wildcardUrl": "{urlLookup}*",
       "name": "fishing info"
     },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/dataPage.json",
+      "name": "s3 lookup - data page"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/educators.json",
+      "name": "s3 lookup - educators page"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/attains/impairmentFields.json",
+      "name": "s3 lookup - attains impairment fields"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/attains/parameters.json",
+      "name": "s3 lookup - attains parameters"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/attains/useFields.json",
+      "name": "s3 lookup - attains use fields"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/cache/glossary.json",
+      "name": "s3 lookup - glossary"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/community/characteristicGroupMappings.json",
+      "name": "s3 lookup - community characteristic group mappings"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/community/usgs-sta-parameters.json",
+      "name": "s3 lookup - community usgs sta parameters"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/community/cyan-metadata.json",
+      "name": "s3 lookup - community cyan metadata"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/community/extreme-weather.json",
+      "name": "s3 lookup - community extreme weather"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/config/layerProps.json",
+      "name": "s3 lookup - config layer props"
+    },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/config/services.json",
+      "name": "s3 lookup - config services"
+    },
     {
       "urlLookup": "origin",
       "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/national/NARS.json",
@@ -313,6 +377,11 @@
       "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/state/waterTypeOptions.json",
       "name": "s3 lookup - state waterTypeOptions"
     },
+    {
+      "urlLookup": "origin",
+      "wildcardUrl": "{urlLookup}/proxy?url={urlLookup}/data/tribe/tribeMapping.json",
+      "name": "s3 lookup - tribe mapping"
+    },
     {
       "urlLookup": "waterbodyService.summary",
       "wildcardUrl": "{urlLookup}?f=json",
@@ -338,6 +407,11 @@
       "wildcardUrl": "{urlLookup}*",
       "name": "Attains_Assessment - map server (summary table)"
     },
+    {
+      "urlLookup": "waterbodyService.controlTable",
+      "wildcardUrl": "{urlLookup}*",
+      "name": "Attains_Assessment - map server (control table)"
+    },
     {
       "urlLookup": "wbd",
       "wildcardUrl": "{urlLookup}*",