From 5f2a904aaded1e409f2a46c02fb2b847f4caaeea Mon Sep 17 00:00:00 2001
From: Tiago Garcia <tiagojsag@gmail.com>
Date: Mon, 22 Aug 2022 14:33:08 +0200
Subject: [PATCH 1/5] WIP - API Gateway API keys

---
 .gitignore                                    |   1 +
 .../modules/k8s_data_layer/elasticsearch.tf   |   2 +-
 .../mongodb_apps/mongodb-apps-values.yaml     |  10 +-
 .../k8s_data_layer/postgresql/postgresql.yaml |  52 +++---
 .../k8s_data_layer/rabbitmq/rabbitmq.yaml     |  28 ++--
 .../modules/k8s_data_layer/redis/redis-db.md  |   4 +-
 .../modules/k8s_data_layer/redis/redis.yaml   |  60 +++----
 .../modules/k8s_data_layer/versions.tf        |   8 +-
 .../cluster-autoscaler-autodiscover.yaml.tmpl |  94 +++++------
 .../container_insights.yaml.tmpl              |  10 +-
 .../modules/k8s_infrastructure/main.tf        |   4 +-
 .../modules/k8s_infrastructure/versions.tf    |   8 +-
 .../k8s_microservice_routing/authorizer.tf    | 127 +++++++++++++++
 .../endpoint-proxy/main.tf                    |   4 +-
 .../endpoint-proxy/variable.tf                |  23 +++
 .../k8s_microservice_routing/endpoint/main.tf |  22 ++-
 .../endpoint/variable.tf                      |  23 +++
 .../api_key_authorizer_lambda.py              |  21 +++
 .../modules/k8s_microservice_routing/main.tf  | 150 +++++++++---------
 .../{ => microservices}/analysis-gee/main.tf  |  86 +++++-----
 .../analysis-gee/outputs.tf                   |   0
 .../analysis-gee/variables.tf                 |   0
 .../aqueduct-analysis/main.tf                 |   2 +-
 .../aqueduct-analysis/outputs.tf              |   0
 .../aqueduct-analysis/variables.tf            |   0
 .../{ => microservices}/arcgis-proxy/main.tf  |   2 +-
 .../arcgis-proxy/outputs.tf                   |   0
 .../arcgis-proxy/variables.tf                 |   0
 .../{ => microservices}/arcgis/main.tf        |  14 +-
 .../{ => microservices}/arcgis/outputs.tf     |   0
 .../{ => microservices}/arcgis/variables.tf   |   0
 .../{ => microservices}/area/main.tf          |  16 +-
 .../{ => microservices}/area/outputs.tf       |   0
 .../{ => microservices}/area/variables.tf     |   0
 .../{ => microservices}/authorization/main.tf |  10 +-
 .../authorization/outputs.tf                  |   0
 .../authorization/variables.tf                |   0
 .../{ => microservices}/bigquery/main.tf      |  12 +-
 .../{ => microservices}/bigquery/outputs.tf   |   0
 .../{ => microservices}/bigquery/variables.tf |   0
 .../{ => microservices}/biomass/main.tf       |   2 +-
 .../{ => microservices}/biomass/outputs.tf    |   0
 .../{ => microservices}/biomass/variables.tf  |   0
 .../{ => microservices}/carto/main.tf         |  14 +-
 .../{ => microservices}/carto/outputs.tf      |   0
 .../{ => microservices}/carto/variables.tf    |   0
 .../{ => microservices}/converter/main.tf     |   2 +-
 .../{ => microservices}/converter/outputs.tf  |   0
 .../converter/variables.tf                    |   0
 .../{ => microservices}/dataset/main.tf       |  40 ++++-
 .../{ => microservices}/dataset/outputs.tf    |   0
 .../{ => microservices}/dataset/variables.tf  |  23 +++
 .../doc-orchestrator/main.tf                  |   2 +-
 .../doc-orchestrator/outputs.tf               |   0
 .../doc-orchestrator/variables.tf             |   0
 .../document-adapter/main.tf                  |  50 +++---
 .../document-adapter/outputs.tf               |   0
 .../document-adapter/variables.tf             |   0
 .../fires-summary-stats/main.tf               |   4 +-
 .../fires-summary-stats/outputs.tf            |   0
 .../fires-summary-stats/variables.tf          |   0
 .../{ => microservices}/forest-change/main.tf |   6 +-
 .../forest-change/outputs.tf                  |   0
 .../forest-change/variables.tf                |   0
 .../forest-watcher-api/main.tf                |   4 +-
 .../forest-watcher-api/outputs.tf             |   0
 .../forest-watcher-api/variables.tf           |   0
 .../{ => microservices}/forms/main.tf         |   8 +-
 .../{ => microservices}/forms/outputs.tf      |   0
 .../{ => microservices}/forms/variables.tf    |   0
 .../{ => microservices}/fw-alerts/main.tf     |   2 +-
 .../{ => microservices}/fw-alerts/outputs.tf  |   0
 .../fw-alerts/variables.tf                    |   0
 .../fw-contextual-layers/main.tf              |   6 +-
 .../fw-contextual-layers/outputs.tf           |   0
 .../fw-contextual-layers/variables.tf         |   0
 .../{ => microservices}/fw-teams/main.tf      |   4 +-
 .../{ => microservices}/fw-teams/outputs.tf   |   0
 .../{ => microservices}/fw-teams/variables.tf |   0
 .../{ => microservices}/gee-tiles/main.tf     |   4 +-
 .../{ => microservices}/gee-tiles/outputs.tf  |   0
 .../gee-tiles/variables.tf                    |   0
 .../{ => microservices}/gee/main.tf           |  14 +-
 .../{ => microservices}/gee/outputs.tf        |   0
 .../{ => microservices}/gee/variables.tf      |   0
 .../{ => microservices}/geostore/main.tf      |  12 +-
 .../{ => microservices}/geostore/outputs.tf   |   0
 .../{ => microservices}/geostore/variables.tf |   0
 .../{ => microservices}/gfw-adapter/main.tf   |  14 +-
 .../gfw-adapter/outputs.tf                    |   0
 .../gfw-adapter/variables.tf                  |   0
 .../{ => microservices}/gfw-contact/main.tf   |   2 +-
 .../gfw-contact/outputs.tf                    |   0
 .../gfw-contact/variables.tf                  |   0
 .../{ => microservices}/gfw-forma/main.tf     |   6 +-
 .../{ => microservices}/gfw-forma/outputs.tf  |   0
 .../gfw-forma/variables.tf                    |   0
 .../{ => microservices}/gfw-guira/main.tf     |  12 +-
 .../{ => microservices}/gfw-guira/outputs.tf  |   0
 .../gfw-guira/variables.tf                    |   0
 .../{ => microservices}/gfw-metadata/main.tf  |   2 +-
 .../gfw-metadata/outputs.tf                   |   0
 .../gfw-metadata/variables.tf                 |   0
 .../gfw-ogr-gfw-pro/main.tf                   |   2 +-
 .../gfw-ogr-gfw-pro/outputs.tf                |   0
 .../gfw-ogr-gfw-pro/variables.tf              |   0
 .../{ => microservices}/gfw-ogr/main.tf       |   4 +-
 .../{ => microservices}/gfw-ogr/outputs.tf    |   0
 .../{ => microservices}/gfw-ogr/variables.tf  |   0
 .../{ => microservices}/gfw-prodes/main.tf    |  12 +-
 .../{ => microservices}/gfw-prodes/outputs.tf |   0
 .../gfw-prodes/variables.tf                   |   0
 .../{ => microservices}/gfw-umd/main.tf       |   6 +-
 .../{ => microservices}/gfw-umd/outputs.tf    |   0
 .../{ => microservices}/gfw-umd/variables.tf  |   0
 .../{ => microservices}/gfw-user/main.tf      |  12 +-
 .../{ => microservices}/gfw-user/outputs.tf   |   0
 .../{ => microservices}/gfw-user/variables.tf |   0
 .../glad-analysis-tiled/main.tf               |  16 +-
 .../glad-analysis-tiled/outputs.tf            |   0
 .../glad-analysis-tiled/variables.tf          |   0
 .../{ => microservices}/graph-client/main.tf  |   2 +-
 .../graph-client/outputs.tf                   |   0
 .../graph-client/variables.tf                 |   0
 .../{ => microservices}/gs-pro-config/main.tf |   2 +-
 .../gs-pro-config/outputs.tf                  |   0
 .../gs-pro-config/variables.tf                |   0
 .../{ => microservices}/high-res/main.tf      |   2 +-
 .../{ => microservices}/high-res/outputs.tf   |   0
 .../{ => microservices}/high-res/variables.tf |   0
 .../{ => microservices}/imazon/main.tf        |  12 +-
 .../{ => microservices}/imazon/outputs.tf     |   0
 .../{ => microservices}/imazon/variables.tf   |   0
 .../{ => microservices}/layer/main.tf         |  22 +--
 .../{ => microservices}/layer/outputs.tf      |   0
 .../{ => microservices}/layer/variables.tf    |   0
 .../{ => microservices}/metadata/main.tf      |  34 ++--
 .../{ => microservices}/metadata/outputs.tf   |   0
 .../{ => microservices}/metadata/variables.tf |   0
 .../{ => microservices}/nexgddp/main.tf       |  30 ++--
 .../{ => microservices}/nexgddp/outputs.tf    |   0
 .../{ => microservices}/nexgddp/variables.tf  |   0
 .../{ => microservices}/proxy/main.tf         |   2 +-
 .../{ => microservices}/proxy/outputs.tf      |   0
 .../{ => microservices}/proxy/variables.tf    |   0
 .../{ => microservices}/query/main.tf         |  22 +--
 .../{ => microservices}/query/outputs.tf      |   0
 .../{ => microservices}/query/variables.tf    |   0
 .../{ => microservices}/quicc/main.tf         |   4 +-
 .../{ => microservices}/quicc/outputs.tf      |   0
 .../{ => microservices}/quicc/variables.tf    |   0
 .../resource-watch-manager/main.tf            |  68 ++++----
 .../resource-watch-manager/outputs.tf         |   0
 .../resource-watch-manager/variables.tf       |   0
 .../{ => microservices}/resource/main.tf      |   3 +-
 .../{ => microservices}/resource/outputs.tf   |   0
 .../{ => microservices}/resource/variables.tf |   0
 .../{ => microservices}/rw-lp/main.tf         |   4 +-
 .../{ => microservices}/rw-lp/outputs.tf      |   0
 .../{ => microservices}/rw-lp/variables.tf    |   0
 .../salesforce-connector/main.tf              |   2 +-
 .../salesforce-connector/outputs.tf           |   0
 .../salesforce-connector/variables.tf         |   0
 .../{ => microservices}/story/main.tf         |   6 +-
 .../{ => microservices}/story/outputs.tf      |   0
 .../{ => microservices}/story/variables.tf    |   0
 .../{ => microservices}/subscriptions/main.tf |   6 +-
 .../subscriptions/outputs.tf                  |   0
 .../subscriptions/variables.tf                |   0
 .../{ => microservices}/task-executor/main.tf |   4 +-
 .../task-executor/outputs.tf                  |   0
 .../task-executor/variables.tf                |   0
 .../true-color-tiles/main.tf                  |   2 +-
 .../true-color-tiles/outputs.tf               |   0
 .../true-color-tiles/variables.tf             |   0
 .../{ => microservices}/viirs-fires/main.tf   |  12 +-
 .../viirs-fires/outputs.tf                    |   0
 .../viirs-fires/variables.tf                  |   0
 .../{ => microservices}/vocabulary/main.tf    |  62 ++++----
 .../{ => microservices}/vocabulary/outputs.tf |   0
 .../vocabulary/variables.tf                   |   0
 .../{ => microservices}/webshot/main.tf       |   4 +-
 .../{ => microservices}/webshot/outputs.tf    |   0
 .../{ => microservices}/webshot/variables.tf  |   0
 .../{ => microservices}/widget/main.tf        |  12 +-
 .../{ => microservices}/widget/outputs.tf     |   0
 .../{ => microservices}/widget/variables.tf   |   0
 .../v1-redirect/main.tf                       |   2 +-
 terraform-localstack/main.tf                  | 104 ++++++------
 terraform/modules/bootstrap/main.tf           |   6 +-
 terraform/modules/eks/main.tf                 |  24 ++-
 191 files changed, 893 insertions(+), 638 deletions(-)
 create mode 100644 terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorizer.tf
 create mode 100644 terraform-k8s-infrastructure/modules/k8s_microservice_routing/lambda_source/api_key_authorizer_lambda.py
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/analysis-gee/main.tf (94%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/analysis-gee/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/analysis-gee/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/aqueduct-analysis/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/aqueduct-analysis/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/aqueduct-analysis/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/arcgis-proxy/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/arcgis-proxy/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/arcgis-proxy/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/arcgis/main.tf (96%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/arcgis/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/arcgis/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/area/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/area/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/area/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/authorization/main.tf (97%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/authorization/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/authorization/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/bigquery/main.tf (96%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/bigquery/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/bigquery/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/biomass/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/biomass/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/biomass/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/carto/main.tf (96%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/carto/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/carto/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/converter/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/converter/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/converter/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/dataset/main.tf (84%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/dataset/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/dataset/variables.tf (78%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/doc-orchestrator/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/doc-orchestrator/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/doc-orchestrator/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/document-adapter/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/document-adapter/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/document-adapter/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fires-summary-stats/main.tf (97%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fires-summary-stats/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fires-summary-stats/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/forest-change/main.tf (96%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/forest-change/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/forest-change/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/forest-watcher-api/main.tf (92%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/forest-watcher-api/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/forest-watcher-api/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/forms/main.tf (91%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/forms/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/forms/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fw-alerts/main.tf (94%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fw-alerts/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fw-alerts/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fw-contextual-layers/main.tf (91%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fw-contextual-layers/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fw-contextual-layers/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fw-teams/main.tf (91%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fw-teams/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/fw-teams/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gee-tiles/main.tf (97%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gee-tiles/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gee-tiles/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gee/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gee/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gee/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/geostore/main.tf (96%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/geostore/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/geostore/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-adapter/main.tf (96%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-adapter/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-adapter/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-contact/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-contact/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-contact/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-forma/main.tf (96%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-forma/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-forma/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-guira/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-guira/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-guira/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-metadata/main.tf (94%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-metadata/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-metadata/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-ogr-gfw-pro/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-ogr-gfw-pro/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-ogr-gfw-pro/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-ogr/main.tf (97%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-ogr/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-ogr/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-prodes/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-prodes/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-prodes/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-umd/main.tf (97%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-umd/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-umd/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-user/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-user/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gfw-user/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/glad-analysis-tiled/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/glad-analysis-tiled/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/glad-analysis-tiled/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/graph-client/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/graph-client/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/graph-client/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gs-pro-config/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gs-pro-config/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/gs-pro-config/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/high-res/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/high-res/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/high-res/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/imazon/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/imazon/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/imazon/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/layer/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/layer/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/layer/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/metadata/main.tf (94%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/metadata/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/metadata/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/nexgddp/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/nexgddp/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/nexgddp/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/proxy/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/proxy/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/proxy/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/query/main.tf (94%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/query/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/query/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/quicc/main.tf (97%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/quicc/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/quicc/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/resource-watch-manager/main.tf (93%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/resource-watch-manager/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/resource-watch-manager/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/resource/main.tf (97%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/resource/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/resource/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/rw-lp/main.tf (97%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/rw-lp/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/rw-lp/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/salesforce-connector/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/salesforce-connector/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/salesforce-connector/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/story/main.tf (96%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/story/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/story/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/subscriptions/main.tf (96%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/subscriptions/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/subscriptions/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/task-executor/main.tf (97%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/task-executor/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/task-executor/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/true-color-tiles/main.tf (98%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/true-color-tiles/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/true-color-tiles/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/viirs-fires/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/viirs-fires/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/viirs-fires/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/vocabulary/main.tf (94%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/vocabulary/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/vocabulary/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/webshot/main.tf (97%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/webshot/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/webshot/variables.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/widget/main.tf (95%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/widget/outputs.tf (100%)
 rename terraform-k8s-infrastructure/modules/k8s_microservice_routing/{ => microservices}/widget/variables.tf (100%)

diff --git a/.gitignore b/.gitignore
index 714e1af8..e6c97827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ terraform-k8s-infrastructure/vars/private.tfvars
 
 terraform.tfstate
 terraform.tfstate.backup
+/terraform-k8s-infrastructure/modules/k8s_microservice_routing/lambda.zip
diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/elasticsearch.tf b/terraform-k8s-infrastructure/modules/k8s_data_layer/elasticsearch.tf
index b6292127..1ecc2c9c 100644
--- a/terraform-k8s-infrastructure/modules/k8s_data_layer/elasticsearch.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_data_layer/elasticsearch.tf
@@ -167,7 +167,7 @@ resource "aws_elasticsearch_domain" "rw-api-elasticsearch" {
     ]
 
     security_group_ids = [
-    aws_security_group.elasticsearch-sg.id]
+      aws_security_group.elasticsearch-sg.id]
   }
 
   advanced_options = {
diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/mongodb_apps/mongodb-apps-values.yaml b/terraform-k8s-infrastructure/modules/k8s_data_layer/mongodb_apps/mongodb-apps-values.yaml
index 5bd73f85..2ddfd7e5 100644
--- a/terraform-k8s-infrastructure/modules/k8s_data_layer/mongodb_apps/mongodb-apps-values.yaml
+++ b/terraform-k8s-infrastructure/modules/k8s_data_layer/mongodb_apps/mongodb-apps-values.yaml
@@ -3,7 +3,7 @@ port: 27017
 
 replicaSetName: mongodb-apps
 
-podDisruptionBudget: {}
+podDisruptionBudget: { }
 # maxUnavailable: 1
 # minAvailable: 2
 
@@ -21,7 +21,7 @@ image:
   pullPolicy: IfNotPresent
 
 # Annotations to be added to MongoDB pods
-podAnnotations: {}
+podAnnotations: { }
 
 resources:
   requests:
@@ -33,7 +33,7 @@ resources:
 
 ## Node selector
 ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
-nodeSelector: {}
+nodeSelector: { }
 
 affinity:
   nodeAffinity:
@@ -67,10 +67,10 @@ persistentVolume:
   accessModes:
     - ReadWriteOnce
   size: 50Gi
-  annotations: {}
+  annotations: { }
 
 # Annotations to be added to the service
-serviceAnnotations: {}
+serviceAnnotations: { }
 
 tls:
   # Enable or disable MongoDB TLS support
diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/postgresql/postgresql.yaml b/terraform-k8s-infrastructure/modules/k8s_data_layer/postgresql/postgresql.yaml
index a83ec7a7..32a2cd19 100644
--- a/terraform-k8s-infrastructure/modules/k8s_data_layer/postgresql/postgresql.yaml
+++ b/terraform-k8s-infrastructure/modules/k8s_data_layer/postgresql/postgresql.yaml
@@ -3,7 +3,7 @@
 ## Current available global Docker image parameters: imageRegistry and imagePullSecrets
 ##
 global:
-  postgresql: {}
+  postgresql: { }
 #   imageRegistry: myRegistryName
 #   imagePullSecrets:
 #     - myRegistryKeySecretName
@@ -118,7 +118,7 @@ postgresqlDataDir: /bitnami/postgresql/data
 ##     value: "bar"
 ##
 # extraEnv:
-extraEnv: []
+extraEnv: [ ]
 
 ## Name of a ConfigMap containing extra env vars
 ##
@@ -222,7 +222,7 @@ service:
 
   ## Provide any additional annotations which may be required.
   ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
-  annotations: {}
+  annotations: { }
   ## Set the LoadBalancer service type to internal only.
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
   ##
@@ -277,7 +277,7 @@ persistence:
   accessModes:
     - ReadWriteOnce
   size: 75Gi
-  annotations: {}
+  annotations: { }
 
 ## updateStrategy for PostgreSQL StatefulSet and its slaves StatefulSets
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
@@ -293,7 +293,7 @@ master:
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
   ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
-  nodeSelector: {}
+  nodeSelector: { }
   affinity:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
@@ -303,18 +303,18 @@ master:
                 operator: In
                 values:
                   - core
-  tolerations: []
-  labels: {}
-  annotations: {}
-  podLabels: {}
-  podAnnotations: {}
+  tolerations: [ ]
+  labels: { }
+  annotations: { }
+  podLabels: { }
+  podAnnotations: { }
   priorityClassName: ""
   ## Additional PostgreSQL Master Volume mounts
   ##
-  extraVolumeMounts: []
+  extraVolumeMounts: [ ]
   ## Additional PostgreSQL Master Volumes
   ##
-  extraVolumes: []
+  extraVolumes: [ ]
 
 ##
 ## PostgreSQL Slave parameters
@@ -325,20 +325,20 @@ slave:
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
   ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
-  nodeSelector: {}
-  affinity: {}
-  tolerations: []
-  labels: {}
-  annotations: {}
-  podLabels: {}
-  podAnnotations: {}
+  nodeSelector: { }
+  affinity: { }
+  tolerations: [ ]
+  labels: { }
+  annotations: { }
+  podLabels: { }
+  podAnnotations: { }
   priorityClassName: ""
   ## Additional PostgreSQL Slave Volume mounts
   ##
-  extraVolumeMounts: []
+  extraVolumeMounts: [ ]
   ## Additional PostgreSQL Slave Volumes
   ##
-  extraVolumes: []
+  extraVolumes: [ ]
 
 ## Configure resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
@@ -370,7 +370,7 @@ networkPolicy:
     ##
     # explicitNamespacesSelector:
     # matchLabels:
-    # role: frontend
+  # role: frontend
   # matchExpressions:
   # - {key: role, operator: In, values: [frontend]}
 
@@ -405,7 +405,7 @@ metrics:
     loadBalancerIP:
   serviceMonitor:
     enabled: false
-    additionalLabels: {}
+    additionalLabels: { }
     # namespace: monitoring
     # interval: 30s
     # scrapeTimeout: 10s
@@ -414,9 +414,9 @@ metrics:
   ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
   prometheusRule:
     enabled: false
-    additionalLabels: {}
+    additionalLabels: { }
     namespace: ""
-    rules: []
+    rules: [ ]
       ## These are just examples rules, please adapt them to your needs.
       ## Make sure to constraint the rules to the current postgresql service.
       # - alert: HugeReplicationLag
@@ -424,7 +424,7 @@ metrics:
       #   for: 1m
       #   labels:
       #     severity: critical
-      #   annotations:
+    #   annotations:
     #     description: replication for {{ template "postgresql.fullname" . }} PostgreSQL is lagging by {{ "{{ $value }}" }} hour(s).
     #     summary: PostgreSQL replication is lagging by {{ "{{ $value }}" }} hour(s).
   image:
diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/rabbitmq/rabbitmq.yaml b/terraform-k8s-infrastructure/modules/k8s_data_layer/rabbitmq/rabbitmq.yaml
index d5b6b77e..a71ee724 100644
--- a/terraform-k8s-infrastructure/modules/k8s_data_layer/rabbitmq/rabbitmq.yaml
+++ b/terraform-k8s-infrastructure/modules/k8s_data_layer/rabbitmq/rabbitmq.yaml
@@ -3,9 +3,9 @@
 ## Current available global Docker image parameters: imageRegistry and imagePullSecrets
 ##
 global:
-# imageRegistry: dockerhub
- imagePullSecrets:
-   - regcred
+  # imageRegistry: dockerhub
+  imagePullSecrets:
+    - regcred
 #   storageClass: myStorageClass
 
 ## Bitnami RabbitMQ image version
@@ -124,7 +124,7 @@ rabbitmq:
 
   ## environment variables to configure rabbitmq
   ## ref: https://www.rabbitmq.com/configure.html#customise-environment
-  env: {}
+  env: { }
 
   ## Configuration file content: required cluster configuration
   ## Do not override unless you know what you are doing. To add more configuration, use `extraConfiguration` of `advancedConfiguration` instead
@@ -214,7 +214,7 @@ service:
   managerPort: 15672
 
   ## Service annotations
-  annotations: {}
+  annotations: { }
   # service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0
 
   ## Load Balancer sources
@@ -230,7 +230,7 @@ service:
   # extraContainerPorts:
 
 # Additional pod labels to apply
-podLabels: {}
+podLabels: { }
 
 ## Pod Security Context
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
@@ -239,7 +239,7 @@ securityContext:
   enabled: true
   fsGroup: 1001
   runAsUser: 1001
-  extra: {}
+  extra: { }
 
 persistence:
   ## this enables PVC templates that will create one per pod
@@ -316,9 +316,9 @@ updateStrategy:
 ## Node labels and tolerations for pod assignment
 ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
 ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
-nodeSelector: {}
+nodeSelector: { }
 
-tolerations: []
+tolerations: [ ]
 affinity:
   nodeAffinity:
     requiredDuringSchedulingIgnoredDuringExecution:
@@ -347,10 +347,10 @@ affinity:
 ##           topologyKey: failure-domain.beta.kubernetes.io/zone
 
 ## annotations for rabbitmq pods
-podAnnotations: {}
+podAnnotations: { }
 
 ## Configure the podDisruptionBudget
-podDisruptionBudget: {}
+podDisruptionBudget: { }
 # maxUnavailable: 1
 # minAvailable: 1
 
@@ -382,7 +382,7 @@ ingress:
   ## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md
   ##
   ## If tls is set to true, annotation ingress.kubernetes.io/secure-backends: "true" will automatically be set
-  annotations: {}
+  annotations: { }
   #  kubernetes.io/ingress.class: nginx
   #  kubernetes.io/tls-acme: true
 
@@ -423,9 +423,9 @@ forceBoot:
 ## Optionally specify extra secrets to be created by the chart.
 ## This can be useful when combined with load_definitions to automatically create the secret containing the definitions to be loaded.
 ##
-extraSecrets: {}
+extraSecrets: { }
   # load-definition:
   #   load_definition.json: |
-  #     {
+#     {
 #       ...
 #     }
diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/redis/redis-db.md b/terraform-k8s-infrastructure/modules/k8s_data_layer/redis/redis-db.md
index 018b8edf..d4bdaf81 100644
--- a/terraform-k8s-infrastructure/modules/k8s_data_layer/redis/redis-db.md
+++ b/terraform-k8s-infrastructure/modules/k8s_data_layer/redis/redis-db.md
@@ -1,6 +1,8 @@
 # Redis database allocation
 
-Redis uses databases (similar to the traditional concept of a SQL database) to keep data separated. By default, it has 16 databases, numbered 0-15. This document serves to document which RW API microservice uses which database, so we avoid multiple microservices sharing the same database.
+Redis uses databases (similar to the traditional concept of a SQL database) to keep data separated. By default, it has
+16 databases, numbered 0-15. This document serves to document which RW API microservice uses which database, so we avoid
+multiple microservices sharing the same database.
 
 - 0: Default database. Shared by multiple microservices.
 - 1: <has some koa sessions keys, not clear if CT leftovers>
diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/redis/redis.yaml b/terraform-k8s-infrastructure/modules/k8s_data_layer/redis/redis.yaml
index f19f460a..2c2cd2f5 100644
--- a/terraform-k8s-infrastructure/modules/k8s_data_layer/redis/redis.yaml
+++ b/terraform-k8s-infrastructure/modules/k8s_data_layer/redis/redis.yaml
@@ -6,8 +6,8 @@ global:
   # imageRegistry: dockerhub
   imagePullSecrets:
     - regcred
-#   storageClass: myStorageClass
-  redis: {}
+  #   storageClass: myStorageClass
+  redis: { }
 
 ## Bitnami Redis image version
 ## ref: https://hub.docker.com/r/bitnami/redis/tags/
@@ -127,8 +127,8 @@ sentinel:
     ## set the LoadBalancer service type to internal only.
     ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
     ##
-    annotations: {}
-    labels: {}
+    annotations: { }
+    labels: { }
     loadBalancerIP:
 
 ## Specifies the Kubernetes Cluster's Domain Name.
@@ -149,8 +149,8 @@ networkPolicy:
 
   ## Allow connections from other namespacess. Just set label for namespace and set label for pods (optional).
   ##
-  ingressNSMatchLabels: {}
-  ingressNSPodMatchLabels: {}
+  ingressNSMatchLabels: { }
+  ingressNSPodMatchLabels: { }
 
 serviceAccount:
   ## Specifies whether a ServiceAccount should be created
@@ -176,7 +176,7 @@ rbac:
     #      - use
     #    resourceNames:
     #      - gce.unprivileged
-    rules: []
+    rules: [ ]
 
 ## Redis pod Security Context
 securityContext:
@@ -208,10 +208,10 @@ usePassword: false
 usePasswordFile: false
 
 ## Persist data to a persistent volume (Redis Master)
-persistence: {}
+persistence: { }
   ## A manually managed Persistent Volume and Claim
   ## Requires persistence.enabled: true
-  ## If defined, PVC must be created manually before volume will be bound
+## If defined, PVC must be created manually before volume will be bound
 # existingClaim:
 
 # Redis port
@@ -237,7 +237,7 @@ master:
   ## extraFlags:
   ##  - "--maxmemory-policy volatile-ttl"
   ##  - "--repl-backlog-size 1024mb"
-  extraFlags: []
+  extraFlags: [ ]
   ## Comma-separated list of Redis commands to disable
   ##
   ## Can be used to disable Redis commands for security reasons.
@@ -250,8 +250,8 @@ master:
 
   ## Redis Master additional pod labels and annotations
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-  podLabels: {}
-  podAnnotations: {}
+  podLabels: { }
+  podAnnotations: { }
 
   ## Redis Master resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
@@ -318,8 +318,8 @@ master:
     ## set the LoadBalancer service type to internal only.
     ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
     ##
-    annotations: {}
-    labels: {}
+    annotations: { }
+    labels: { }
     loadBalancerIP:
     # loadBalancerSourceRanges: ["10.0.0.0/8"]
 
@@ -347,8 +347,8 @@ master:
     size: 20Gi
     ## Persistent Volume selectors
     ## https://kubernetes.io/docs/concepts/storage/persistent-volumes/#selector
-    matchLabels: {}
-    matchExpressions: {}
+    matchLabels: { }
+    matchExpressions: { }
 
   ## Update strategy, can be set to RollingUpdate or onDelete by default.
   ## https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#updating-statefulsets
@@ -382,8 +382,8 @@ slave:
     ## set the LoadBalancer service type to internal only.
     ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
     ##
-    annotations: {}
-    labels: {}
+    annotations: { }
+    labels: { }
     loadBalancerIP:
     # loadBalancerSourceRanges: ["10.0.0.0/8"]
 
@@ -397,7 +397,7 @@ slave:
   ##
   configmap:
   ## Redis extra flags
-  extraFlags: []
+  extraFlags: [ ]
   ## List of Redis commands to disable
   disableCommands:
     - FLUSHDB
@@ -449,8 +449,8 @@ slave:
   # schedulerName:
 
   ## Redis slave pod Annotation and Labels
-  podLabels: {}
-  podAnnotations: {}
+  podLabels: { }
+  podAnnotations: { }
 
   ## Redis slave pod priorityClassName
   # priorityClassName: {}
@@ -479,8 +479,8 @@ slave:
     size: 8Gi
     ## Persistent Volume selectors
     ## https://kubernetes.io/docs/concepts/storage/persistent-volumes/#selector
-    matchLabels: {}
-    matchExpressions: {}
+    matchLabels: { }
+    matchExpressions: { }
 
   ## Update strategy, can be set to RollingUpdate or onDelete by default.
   ## https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#updating-statefulsets
@@ -543,17 +543,17 @@ metrics:
     ## Use serviceLoadBalancerIP to request a specific static IP,
     ## otherwise leave blank
     # loadBalancerIP:
-    annotations: {}
-    labels: {}
+    annotations: { }
+    labels: { }
 
   ## Custom PrometheusRule to be defined
   ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
   ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
   prometheusRule:
     enabled: false
-    additionalLabels: {}
+    additionalLabels: { }
     namespace: ""
-    rules: []
+    rules: [ ]
       ## These are just examples rules, please adapt them to your needs.
       ## Make sure to constraint the rules to the current postgresql service.
       #  - alert: RedisDown
@@ -582,7 +582,7 @@ metrics:
       #    labels:
       #      severity: error
       #    annotations:
-      #      summary: Redis instance {{ "{{ $instance }}" }} has evicted keys
+    #      summary: Redis instance {{ "{{ $instance }}" }} has evicted keys
     #      description: Redis instance {{ "{{ $instance }}" }} has evicted {{ "{{ $value }}" }} keys in the last 5 minutes.
 
 ##
@@ -602,7 +602,7 @@ volumePermissions:
     ##
     # pullSecrets:
     #   - myRegistryKeySecretName
-  resources: {}
+  resources: { }
   # resources:
   #   requests:
   #     memory: 128Mi
@@ -621,7 +621,7 @@ configmap: |-
 ## used to perform sysctl operation to modify Kernel settings (needed sometimes to avoid warnings)
 sysctlImage:
   enabled: false
-  command: []
+  command: [ ]
   registry: docker.io
   repository: bitnami/minideb
   tag: buster
diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/versions.tf b/terraform-k8s-infrastructure/modules/k8s_data_layer/versions.tf
index 1dd57b28..4a65e396 100644
--- a/terraform-k8s-infrastructure/modules/k8s_data_layer/versions.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_data_layer/versions.tf
@@ -45,12 +45,18 @@ provider "helm" {
     host                   = var.cluster_endpoint
     cluster_ca_certificate = base64decode(var.cluster_ca)
     exec {
+<<<<<<< HEAD
       api_version = "client.authentication.k8s.io/v1beta1"
       args = [
+=======
+      api_version = "client.authentication.k8s.io/v1alpha1"
+      args        = [
+>>>>>>> 072f17c (WIP - API Gateway API keys)
         "eks",
         "get-token",
         "--cluster-name",
-      var.cluster_name]
+        var.cluster_name
+      ]
       command = "aws"
     }
   }
diff --git a/terraform-k8s-infrastructure/modules/k8s_infrastructure/cluster_autoscaler/cluster-autoscaler-autodiscover.yaml.tmpl b/terraform-k8s-infrastructure/modules/k8s_infrastructure/cluster_autoscaler/cluster-autoscaler-autodiscover.yaml.tmpl
index e1b82fcf..1403a60a 100644
--- a/terraform-k8s-infrastructure/modules/k8s_infrastructure/cluster_autoscaler/cluster-autoscaler-autodiscover.yaml.tmpl
+++ b/terraform-k8s-infrastructure/modules/k8s_infrastructure/cluster_autoscaler/cluster-autoscaler-autodiscover.yaml.tmpl
@@ -16,52 +16,52 @@ metadata:
     k8s-addon: cluster-autoscaler.addons.k8s.io
     k8s-app: cluster-autoscaler
 rules:
-  - apiGroups: [""]
-    resources: ["events", "endpoints"]
-    verbs: ["create", "patch"]
-  - apiGroups: [""]
-    resources: ["pods/eviction"]
-    verbs: ["create"]
-  - apiGroups: [""]
-    resources: ["pods/status"]
-    verbs: ["update"]
-  - apiGroups: [""]
-    resources: ["endpoints"]
-    resourceNames: ["cluster-autoscaler"]
-    verbs: ["get", "update"]
-  - apiGroups: [""]
-    resources: ["nodes"]
-    verbs: ["watch", "list", "get", "update"]
-  - apiGroups: [""]
+  - apiGroups: [ "" ]
+    resources: [ "events", "endpoints" ]
+    verbs: [ "create", "patch" ]
+  - apiGroups: [ "" ]
+    resources: [ "pods/eviction" ]
+    verbs: [ "create" ]
+  - apiGroups: [ "" ]
+    resources: [ "pods/status" ]
+    verbs: [ "update" ]
+  - apiGroups: [ "" ]
+    resources: [ "endpoints" ]
+    resourceNames: [ "cluster-autoscaler" ]
+    verbs: [ "get", "update" ]
+  - apiGroups: [ "" ]
+    resources: [ "nodes" ]
+    verbs: [ "watch", "list", "get", "update" ]
+  - apiGroups: [ "" ]
     resources:
       - "pods"
       - "services"
       - "replicationcontrollers"
       - "persistentvolumeclaims"
       - "persistentvolumes"
-    verbs: ["watch", "list", "get"]
-  - apiGroups: ["extensions"]
-    resources: ["replicasets", "daemonsets"]
-    verbs: ["watch", "list", "get"]
-  - apiGroups: ["policy"]
-    resources: ["poddisruptionbudgets"]
-    verbs: ["watch", "list"]
-  - apiGroups: ["apps"]
-    resources: ["statefulsets", "replicasets", "daemonsets"]
-    verbs: ["watch", "list", "get"]
-  - apiGroups: ["storage.k8s.io"]
-    resources: ["storageclasses", "csinodes"]
-    verbs: ["watch", "list", "get"]
-  - apiGroups: ["batch", "extensions"]
-    resources: ["jobs"]
-    verbs: ["get", "list", "watch", "patch"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["create"]
-  - apiGroups: ["coordination.k8s.io"]
-    resourceNames: ["cluster-autoscaler"]
-    resources: ["leases"]
-    verbs: ["get", "update"]
+    verbs: [ "watch", "list", "get" ]
+  - apiGroups: [ "extensions" ]
+    resources: [ "replicasets", "daemonsets" ]
+    verbs: [ "watch", "list", "get" ]
+  - apiGroups: [ "policy" ]
+    resources: [ "poddisruptionbudgets" ]
+    verbs: [ "watch", "list" ]
+  - apiGroups: [ "apps" ]
+    resources: [ "statefulsets", "replicasets", "daemonsets" ]
+    verbs: [ "watch", "list", "get" ]
+  - apiGroups: [ "storage.k8s.io" ]
+    resources: [ "storageclasses", "csinodes" ]
+    verbs: [ "watch", "list", "get" ]
+  - apiGroups: [ "batch", "extensions" ]
+    resources: [ "jobs" ]
+    verbs: [ "get", "list", "watch", "patch" ]
+  - apiGroups: [ "coordination.k8s.io" ]
+    resources: [ "leases" ]
+    verbs: [ "create" ]
+  - apiGroups: [ "coordination.k8s.io" ]
+    resourceNames: [ "cluster-autoscaler" ]
+    resources: [ "leases" ]
+    verbs: [ "get", "update" ]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -72,13 +72,13 @@ metadata:
     k8s-addon: cluster-autoscaler.addons.k8s.io
     k8s-app: cluster-autoscaler
 rules:
-  - apiGroups: [""]
-    resources: ["configmaps"]
-    verbs: ["create","list","watch"]
-  - apiGroups: [""]
-    resources: ["configmaps"]
-    resourceNames: ["cluster-autoscaler-status", "cluster-autoscaler-priority-expander"]
-    verbs: ["delete", "get", "update", "watch"]
+  - apiGroups: [ "" ]
+    resources: [ "configmaps" ]
+    verbs: [ "create","list","watch" ]
+  - apiGroups: [ "" ]
+    resources: [ "configmaps" ]
+    resourceNames: [ "cluster-autoscaler-status", "cluster-autoscaler-priority-expander" ]
+    verbs: [ "delete", "get", "update", "watch" ]
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/terraform-k8s-infrastructure/modules/k8s_infrastructure/container_insights/container_insights.yaml.tmpl b/terraform-k8s-infrastructure/modules/k8s_infrastructure/container_insights/container_insights.yaml.tmpl
index d459b76f..9b120aae 100644
--- a/terraform-k8s-infrastructure/modules/k8s_infrastructure/container_insights/container_insights.yaml.tmpl
+++ b/terraform-k8s-infrastructure/modules/k8s_infrastructure/container_insights/container_insights.yaml.tmpl
@@ -30,12 +30,12 @@ kind: ClusterRole
 metadata:
   name: fluentd-role
 rules:
-  - apiGroups: [""]
+  - apiGroups: [ "" ]
     resources:
       - namespaces
       - pods
       - pods/logs
-    verbs: ["get", "list", "watch"]
+    verbs: [ "get", "list", "watch" ]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -162,7 +162,7 @@ spec:
       initContainers:
         - name: copy-fluentd-config
           image: busybox
-          command: ['sh', '-c', 'cp /config-volume/..data/* /fluentd/etc']
+          command: [ 'sh', '-c', 'cp /config-volume/..data/* /fluentd/etc' ]
           volumeMounts:
             - name: config-volume
               mountPath: /config-volume
@@ -170,7 +170,7 @@ spec:
               mountPath: /fluentd/etc
         - name: update-log-driver
           image: busybox
-          command: ['sh','-c','']
+          command: [ 'sh','-c','' ]
       containers:
         - name: fluentd-cloudwatch
           image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0
@@ -214,7 +214,7 @@ spec:
           configMap:
             name: fluentd-config
         - name: fluentdconf
-          emptyDir: {}
+          emptyDir: { }
         - name: varlog
           hostPath:
             path: /var/log
diff --git a/terraform-k8s-infrastructure/modules/k8s_infrastructure/main.tf b/terraform-k8s-infrastructure/modules/k8s_infrastructure/main.tf
index 55fcd735..d8e46335 100644
--- a/terraform-k8s-infrastructure/modules/k8s_infrastructure/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_infrastructure/main.tf
@@ -22,7 +22,7 @@ module "alb" {
 // File has changes - see link above for details
 data "kubectl_path_documents" "cluster_autoscaler_manifests" {
   pattern = "${path.module}/cluster_autoscaler/cluster-autoscaler-autodiscover.yaml.tmpl"
-  vars = {
+  vars    = {
     cluster_name : var.cluster_name
   }
 }
@@ -49,7 +49,7 @@ resource "kubectl_manifest" "metrics_server" {
 // File has changes - see link above for details
 data "kubectl_path_documents" "container_insights_manifests" {
   pattern = "${path.module}/container_insights/container_insights.yaml.tmpl"
-  vars = {
+  vars    = {
     aws_region : var.aws_region,
     cluster_name : var.cluster_name
   }
diff --git a/terraform-k8s-infrastructure/modules/k8s_infrastructure/versions.tf b/terraform-k8s-infrastructure/modules/k8s_infrastructure/versions.tf
index 9dae2676..b60bcd18 100644
--- a/terraform-k8s-infrastructure/modules/k8s_infrastructure/versions.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_infrastructure/versions.tf
@@ -27,12 +27,18 @@ provider "helm" {
     host                   = var.cluster_endpoint
     cluster_ca_certificate = base64decode(var.cluster_ca)
     exec {
+<<<<<<< HEAD
       api_version = "client.authentication.k8s.io/v1beta1"
       args = [
+=======
+      api_version = "client.authentication.k8s.io/v1alpha1"
+      args        = [
+>>>>>>> 072f17c (WIP - API Gateway API keys)
         "eks",
         "get-token",
         "--cluster-name",
-      var.cluster_name]
+        var.cluster_name
+      ]
       command = "aws"
     }
   }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorizer.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorizer.tf
new file mode 100644
index 00000000..b522e89b
--- /dev/null
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorizer.tf
@@ -0,0 +1,127 @@
+# Lambda Authorizer
+resource "aws_api_gateway_authorizer" "api_key" {
+  name                             = "api_key"
+  rest_api_id                      = aws_api_gateway_rest_api.rw_api_gateway.id
+  type                             = "REQUEST"
+  authorizer_uri                   = aws_lambda_function.authorizer.invoke_arn
+  authorizer_credentials           = aws_iam_role.invocation_role.arn
+  authorizer_result_ttl_in_seconds = 0
+
+  # making sure terraform doesn't require default authorization
+  # header (https://github.com/hashicorp/terraform-provider-aws/issues/5845)
+  identity_source = ","
+}
+
+#resource "aws_lambda_function" "authorizer" {
+#  filename      = "api_gateway/api_key_authorizer_lambda.zip"
+#  function_name = "api_gateway_authorizer_${var.environment}"
+#  runtime       = "python3.8"
+#  role          = aws_iam_role.lambda.arn
+#  handler       = "lambda_function.handler"
+#
+#  source_code_hash = filebase64sha256("api_gateway/api_key_authorizer_lambda.zip")
+#}
+
+data "archive_file" "lambda_zip" {
+  type        = "zip"
+  source_dir  = "${path.module}/lambda_source"
+  output_path = "${path.module}/lambda.zip"
+}
+
+resource "aws_lambda_function" "authorizer" {
+  filename         = "${path.module}/lambda.zip"
+  source_code_hash = data.archive_file.lambda_zip.output_base64sha256
+  function_name    = "api_gateway_authorizer_${var.environment}"
+  role             = aws_iam_role.lambda.arn
+  handler          = "api_key_authorizer_lambda.handler"
+  runtime          = "python3.8"
+}
+
+resource "aws_iam_role" "invocation_role" {
+  name = "api_gateway_auth_invocation_${var.environment}"
+  path = "/"
+
+  assume_role_policy = jsonencode({
+    Statement = [
+      {
+        Action    = "sts:AssumeRole"
+        Effect    = "Allow"
+        Principal = {
+          Service = "apigateway.amazonaws.com"
+        }
+      }
+    ]
+    Version = "2012-10-17"
+  })
+}
+
+resource "aws_iam_role_policy" "invocation_policy" {
+  name = "default"
+  role = aws_iam_role.invocation_role.id
+
+  policy = jsonencode(
+    {
+      "Version" : "2012-10-17",
+      "Statement" : [
+        {
+          "Action" : "lambda:InvokeFunction",
+          "Effect" : "Allow",
+          "Resource" : aws_lambda_function.authorizer.arn
+        }
+      ]
+    }
+  )
+}
+
+resource "aws_iam_role" "lambda" {
+  name = "api_gw_authorizer_lambda_${var.environment}"
+
+  assume_role_policy = jsonencode({
+    Statement = [
+      {
+        Action    = "sts:AssumeRole"
+        Effect    = "Allow"
+        Principal = {
+          Service = "lambda.amazonaws.com"
+        }
+      }
+    ]
+    Version = "2012-10-17"
+  })
+}
+
+# Lambda logging
+resource "aws_cloudwatch_log_group" "example" {
+  name              = "/aws/lambda/api_gw_authorizer_lambda_${var.environment}"
+  retention_in_days = 14
+}
+
+# See also the following AWS managed policy: AWSLambdaBasicExecutionRole
+resource "aws_iam_policy" "lambda_logging" {
+  name        = "lambda_logging"
+  path        = "/"
+  description = "IAM policy for logging from a lambda"
+
+  policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": [
+        "logs:CreateLogGroup",
+        "logs:CreateLogStream",
+        "logs:PutLogEvents"
+      ],
+      "Resource": "arn:aws:logs:*:*:*",
+      "Effect": "Allow"
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_iam_role_policy_attachment" "lambda_logs" {
+  role       = aws_iam_role.lambda.name
+  policy_arn = aws_iam_policy.lambda_logging.arn
+}
+
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint-proxy/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint-proxy/main.tf
index 446cb444..509c5c8c 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint-proxy/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint-proxy/main.tf
@@ -2,8 +2,10 @@ resource "aws_api_gateway_method" "endpoint_proxy_method" {
   rest_api_id        = var.api_gateway.id
   resource_id        = var.api_resource.id
   http_method        = var.method
-  authorization      = "NONE"
   request_parameters = { "method.request.path.proxy" = true }
+  authorization      = var.authorization
+  api_key_required   = var.require_api_key
+  authorizer_id      = var.authorizer_id
 }
 
 resource "aws_api_gateway_integration" "endpoint_proxy_integration" {
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint-proxy/variable.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint-proxy/variable.tf
index 7bc9e762..b1a9e279 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint-proxy/variable.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint-proxy/variable.tf
@@ -22,4 +22,27 @@ variable "method" {
 variable "backend_url" {
   type        = string
   description = "The URL of the backend server to which the request is proxied"
+}
+
+variable "authorizer_id" {
+  type    = string
+  default = ""
+}
+
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
+variable "authorization" {
+  default = "NONE"
+  validation {
+    condition = contains([
+      "NONE",
+      "CUSTOM",
+      "AWS_IAM",
+      "COGNITO_USER_POOLS"
+    ], var.authorization)
+    error_message = "Unknown authorization method."
+  }
 }
\ No newline at end of file
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/main.tf
index e6a745b7..a09eb0e5 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/main.tf
@@ -1,13 +1,17 @@
 resource "aws_api_gateway_method" "endpoint_method" {
-  rest_api_id   = var.api_gateway.id
-  resource_id   = var.api_resource.id
-  http_method   = var.method
-  authorization = "NONE"
+  rest_api_id        = var.api_gateway.id
+  resource_id        = var.api_resource.id
+  http_method        = var.method
   request_parameters = merge(
-    (length(regexall("\\{(.*)\\}", var.api_resource.path_part)) > 0 ? { "method.request.path.${replace(var.api_resource.path_part, "/\\{|\\}|\\+/", "")}" = true } : {}),
-    { for s in var.endpoint_request_parameters : "method.request.path.${s}" => true },
+    (length(regexall("\\{(.*)\\}", var.api_resource.path_part)) > 0 ? {
+      "method.request.path.${replace(var.api_resource.path_part, "/\\{|\\}|\\+/", "")}" = true
+    } : {}),
+    {for s in var.endpoint_request_parameters : "method.request.path.${s}" => true},
     { "method.request.header.Accept" : false }
   )
+  authorization    = var.authorization
+  api_key_required = var.require_api_key
+  authorizer_id    = var.authorizer_id
 }
 
 resource "aws_api_gateway_integration" "endpoint_integration" {
@@ -27,7 +31,9 @@ resource "aws_api_gateway_integration" "endpoint_integration" {
       "integration.request.header.x-rw-domain" = "'${var.x_rw_domain}'"
       "integration.request.header.Accept"      = "method.request.header.Accept"
     },
-    (length(regexall("\\{(.*)\\}", var.api_resource.path_part)) > 0 ? { "integration.request.path.${replace(var.api_resource.path_part, "/\\{|\\}|\\+/", "")}" = "method.request.path.${replace(var.api_resource.path_part, "/\\{|\\}|\\+/", "")}" } : {}),
-    { for s in var.endpoint_request_parameters : "integration.request.path.${s}" => "method.request.path.${s}" }
+    (length(regexall("\\{(.*)\\}", var.api_resource.path_part)) > 0 ? {
+      "integration.request.path.${replace(var.api_resource.path_part, "/\\{|\\}|\\+/", "")}" = "method.request.path.${replace(var.api_resource.path_part, "/\\{|\\}|\\+/", "")}"
+    } : {}),
+    {for s in var.endpoint_request_parameters : "integration.request.path.${s}" => "method.request.path.${s}"}
   )
 }
\ No newline at end of file
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/variable.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/variable.tf
index b390a292..19961439 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/variable.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/variable.tf
@@ -45,4 +45,27 @@ variable "x_rw_domain" {
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
+}
+
+variable "authorizer_id" {
+  type    = string
+  default = null
+}
+
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
+variable "authorization" {
+  default = "NONE"
+  validation {
+    condition = contains([
+      "NONE",
+      "CUSTOM",
+      "AWS_IAM",
+      "COGNITO_USER_POOLS"
+    ], var.authorization)
+    error_message = "Unknown authorization method."
+  }
 }
\ No newline at end of file
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/lambda_source/api_key_authorizer_lambda.py b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/lambda_source/api_key_authorizer_lambda.py
new file mode 100644
index 00000000..00743963
--- /dev/null
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/lambda_source/api_key_authorizer_lambda.py
@@ -0,0 +1,21 @@
+def handler(event, context):
+    api_key = event["headers"].get("x-api-key", None) or event[
+        "queryStringParameters"
+    ].get("x-api-key", "")
+    policy = {
+        "principalId": "x-api-key",
+        "policyDocument": {
+            "Version": "2012-10-17",
+            "Statement": [
+                {
+                    "Action": "execute-api:Invoke",
+                    "Effect": "Allow",
+                    "Resource": event["methodArn"],
+                }
+            ],
+        },
+        "usageIdentifierKey": api_key.strip(),
+    }
+    print(policy)
+
+    return policy
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf
index 1c14013e..0af2e368 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf
@@ -1,7 +1,7 @@
 # import core state
 data "terraform_remote_state" "core" {
   backend = "s3"
-  config = {
+  config  = {
     bucket = var.tf_core_state_bucket
     region = var.aws_region
     key    = "core.tfstate"
@@ -93,32 +93,20 @@ resource "aws_api_gateway_rest_api" "rw_api_gateway" {
   description = "API Gateway for the RW API ${var.dns_prefix} cluster"
 
   endpoint_configuration {
-    types = [
-    "REGIONAL"]
+    types = ["REGIONAL"]
   }
   binary_media_types = ["multipart/form-data"]
 }
 
 data "aws_subnets" "private_subnets" {
   filter {
-    name   = "vpc-id"
-    values = [var.vpc.id]
-  }
-
-  tags = {
-    tier = "private"
+    name   = "tag:tier"
+    values = ["private"]
   }
-}
-
-data "aws_subnets" "public_subnets" {
   filter {
     name   = "vpc-id"
     values = [var.vpc.id]
   }
-
-  tags = {
-    tier = "public"
-  }
 }
 
 data "aws_autoscaling_groups" "apps_autoscaling_group" {
@@ -292,21 +280,21 @@ resource "aws_api_gateway_deployment" "prod" {
 
 // Base API Gateway resources
 module "v1_resource" {
-  source      = "./resource"
+  source      = "./microservices/resource"
   rest_api_id = aws_api_gateway_rest_api.rw_api_gateway.id
   parent_id   = aws_api_gateway_rest_api.rw_api_gateway.root_resource_id
   path_part   = "v1"
 }
 
 module "v2_resource" {
-  source      = "./resource"
+  source      = "./microservices/resource"
   rest_api_id = aws_api_gateway_rest_api.rw_api_gateway.id
   parent_id   = aws_api_gateway_rest_api.rw_api_gateway.root_resource_id
   path_part   = "v2"
 }
 
 module "v3_resource" {
-  source      = "./resource"
+  source      = "./microservices/resource"
   rest_api_id = aws_api_gateway_rest_api.rw_api_gateway.id
   parent_id   = aws_api_gateway_rest_api.rw_api_gateway.root_resource_id
   path_part   = "v3"
@@ -366,13 +354,13 @@ module "v1_redirect" {
 
 // /v1/gfw-metadata proxies to external server
 module "gfw-metadata" {
-  source      = "./gfw-metadata"
+  source      = "./microservices/gfw-metadata"
   api_gateway = aws_api_gateway_rest_api.rw_api_gateway
   v1_resource = module.v1_resource.aws_api_gateway_resource
 }
 
 module "analysis-gee" {
-  source           = "./analysis-gee"
+  source           = "./microservices/analysis-gee"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -395,7 +383,7 @@ module "analysis-gee" {
 }
 
 module "aqueduct-analysis" {
-  source           = "./aqueduct-analysis"
+  source           = "./microservices/aqueduct-analysis"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -412,7 +400,7 @@ module "aqueduct-analysis" {
 }
 
 module "arcgis" {
-  source                    = "./arcgis"
+  source                    = "./microservices/arcgis"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca                = var.cluster_ca
   cluster_endpoint          = var.cluster_endpoint
@@ -437,7 +425,7 @@ module "arcgis" {
 }
 
 module "arcgis-proxy" {
-  source           = "./arcgis-proxy"
+  source           = "./microservices/arcgis-proxy"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -454,7 +442,7 @@ module "arcgis-proxy" {
 }
 
 module "area" {
-  source           = "./area"
+  source           = "./microservices/area"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -477,7 +465,7 @@ module "area" {
 }
 
 module "auth" {
-  source           = "./authorization"
+  source           = "./microservices/authorization"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -495,7 +483,7 @@ module "auth" {
 }
 
 module "bigquery" {
-  source                    = "./bigquery"
+  source                    = "./microservices/bigquery"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca                = var.cluster_ca
   cluster_endpoint          = var.cluster_endpoint
@@ -521,7 +509,7 @@ module "bigquery" {
 }
 
 module "biomass" {
-  source                   = "./biomass"
+  source                   = "./microservices/biomass"
   api_gateway              = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca               = var.cluster_ca
   cluster_endpoint         = var.cluster_endpoint
@@ -543,7 +531,7 @@ module "biomass" {
 }
 
 module "carto" {
-  source                    = "./carto"
+  source                    = "./microservices/carto"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca                = var.cluster_ca
   cluster_endpoint          = var.cluster_endpoint
@@ -569,7 +557,7 @@ module "carto" {
 }
 
 module "converter" {
-  source           = "./converter"
+  source           = "./microservices/converter"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -579,13 +567,13 @@ module "converter" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
-  eks_asg_names = [
+  eks_asg_names    = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0
   ]
 }
 
 module "dataset" {
-  source           = "./dataset"
+  source           = "./microservices/dataset"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -595,6 +583,9 @@ module "dataset" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = true
+#  authorizer_id    = aws_api_gateway_authorizer.api_key.id
+#  authorization    = "CUSTOM"
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0
@@ -602,7 +593,7 @@ module "dataset" {
 }
 
 module "doc-orchestrator" {
-  source           = "./doc-orchestrator"
+  source           = "./microservices/doc-orchestrator"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -619,7 +610,7 @@ module "doc-orchestrator" {
 }
 
 module "document-adapter" {
-  source                 = "./document-adapter"
+  source                 = "./microservices/document-adapter"
   api_gateway            = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca             = var.cluster_ca
   cluster_endpoint       = var.cluster_endpoint
@@ -645,7 +636,7 @@ module "document-adapter" {
 }
 
 module "fires-summary-stats" {
-  source           = "./fires-summary-stats"
+  source           = "./microservices/fires-summary-stats"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -662,7 +653,7 @@ module "fires-summary-stats" {
 }
 
 module "forest-watcher-api" {
-  source           = "./forest-watcher-api"
+  source           = "./microservices/forest-watcher-api"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -680,7 +671,7 @@ module "forest-watcher-api" {
 }
 
 module "forest-change" {
-  source           = "./forest-change"
+  source           = "./microservices/forest-change"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -697,7 +688,7 @@ module "forest-change" {
 }
 
 module "forms" {
-  source           = "./forms"
+  source           = "./microservices/forms"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -715,7 +706,7 @@ module "forms" {
 }
 
 module "fw-alerts" {
-  source           = "./fw-alerts"
+  source           = "./microservices/fw-alerts"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -733,7 +724,7 @@ module "fw-alerts" {
 }
 
 module "fw-contextual-layers" {
-  source           = "./fw-contextual-layers"
+  source           = "./microservices/fw-contextual-layers"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -751,7 +742,7 @@ module "fw-contextual-layers" {
 }
 
 module "fw-teams" {
-  source           = "./fw-teams"
+  source           = "./microservices/fw-teams"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -769,7 +760,7 @@ module "fw-teams" {
 }
 
 module "gee" {
-  source                    = "./gee"
+  source                    = "./microservices/gee"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca                = var.cluster_ca
   cluster_endpoint          = var.cluster_endpoint
@@ -794,7 +785,7 @@ module "gee" {
 }
 
 module "gee-tiles" {
-  source               = "./gee-tiles"
+  source               = "./microservices/gee-tiles"
   api_gateway          = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca           = var.cluster_ca
   cluster_endpoint     = var.cluster_endpoint
@@ -817,7 +808,7 @@ module "gee-tiles" {
 }
 
 module "geostore" {
-  source           = "./geostore"
+  source           = "./microservices/geostore"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -835,7 +826,7 @@ module "geostore" {
 }
 
 module "gfw-adapter" {
-  source                    = "./gfw-adapter"
+  source                    = "./microservices/gfw-adapter"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca                = var.cluster_ca
   cluster_endpoint          = var.cluster_endpoint
@@ -861,7 +852,7 @@ module "gfw-adapter" {
 }
 
 module "gfw-contact" {
-  source           = "./gfw-contact"
+  source           = "./microservices/gfw-contact"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -878,7 +869,7 @@ module "gfw-contact" {
 }
 
 module "gfw-forma" {
-  source           = "./gfw-forma"
+  source           = "./microservices/gfw-forma"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -895,7 +886,7 @@ module "gfw-forma" {
 }
 
 module "gfw-guira" {
-  source           = "./gfw-guira"
+  source           = "./microservices/gfw-guira"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -913,7 +904,7 @@ module "gfw-guira" {
 }
 
 module "gfw-ogr" {
-  source           = "./gfw-ogr"
+  source           = "./microservices/gfw-ogr"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -931,7 +922,7 @@ module "gfw-ogr" {
 }
 
 module "gfw-ogr-gfw-pro" {
-  source           = "./gfw-ogr-gfw-pro"
+  source           = "./microservices/gfw-ogr-gfw-pro"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -948,7 +939,7 @@ module "gfw-ogr-gfw-pro" {
 }
 
 module "gfw-prodes" {
-  source           = "./gfw-prodes"
+  source           = "./microservices/gfw-prodes"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -966,7 +957,7 @@ module "gfw-prodes" {
 }
 
 module "gfw-umd" {
-  source                    = "./gfw-umd"
+  source                    = "./microservices/gfw-umd"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca                = var.cluster_ca
   cluster_endpoint          = var.cluster_endpoint
@@ -986,7 +977,7 @@ module "gfw-umd" {
 }
 
 module "gfw-user" {
-  source           = "./gfw-user"
+  source           = "./microservices/gfw-user"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1004,7 +995,7 @@ module "gfw-user" {
 }
 
 module "glad-analysis-tiled" {
-  source                  = "./glad-analysis-tiled"
+  source                  = "./microservices/glad-analysis-tiled"
   api_gateway             = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca              = var.cluster_ca
   cluster_endpoint        = var.cluster_endpoint
@@ -1021,11 +1012,12 @@ module "glad-analysis-tiled" {
   ]
 
   depends_on = [
-  module.fires-summary-stats]
+    module.fires-summary-stats
+  ]
 }
 
 module "graph-client" {
-  source           = "./graph-client"
+  source           = "./microservices/graph-client"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1042,7 +1034,7 @@ module "graph-client" {
 }
 
 module "gs-pro-config" {
-  source           = "./gs-pro-config"
+  source           = "./microservices/gs-pro-config"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1059,7 +1051,7 @@ module "gs-pro-config" {
 }
 
 module "high-res" {
-  source           = "./high-res"
+  source           = "./microservices/high-res"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1076,7 +1068,7 @@ module "high-res" {
 }
 
 module "imazon" {
-  source           = "./imazon"
+  source           = "./microservices/imazon"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1099,7 +1091,7 @@ module "imazon" {
 }
 
 module "layer" {
-  source                 = "./layer"
+  source                 = "./microservices/layer"
   api_gateway            = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca             = var.cluster_ca
   cluster_endpoint       = var.cluster_endpoint
@@ -1122,7 +1114,7 @@ module "layer" {
 }
 
 module "metadata" {
-  source                           = "./metadata"
+  source                           = "./microservices/metadata"
   api_gateway                      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca                       = var.cluster_ca
   cluster_endpoint                 = var.cluster_endpoint
@@ -1145,7 +1137,7 @@ module "metadata" {
 }
 
 module "nexgddp" {
-  source                    = "./nexgddp"
+  source                    = "./microservices/nexgddp"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca                = var.cluster_ca
   cluster_endpoint          = var.cluster_endpoint
@@ -1174,7 +1166,7 @@ module "nexgddp" {
 }
 
 module "proxy" {
-  source           = "./proxy"
+  source           = "./microservices/proxy"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1195,7 +1187,7 @@ module "proxy" {
 }
 
 module "query" {
-  source           = "./query"
+  source           = "./microservices/query"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1216,7 +1208,7 @@ module "query" {
 }
 
 module "quicc" {
-  source           = "./quicc"
+  source           = "./microservices/quicc"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1237,7 +1229,7 @@ module "quicc" {
 }
 
 module "rw-lp" {
-  source           = "./rw-lp"
+  source           = "./microservices/rw-lp"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1253,7 +1245,7 @@ module "rw-lp" {
 }
 
 module "resource-watch-manager" {
-  source           = "./resource-watch-manager"
+  source           = "./microservices/resource-watch-manager"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1270,7 +1262,7 @@ module "resource-watch-manager" {
 }
 
 module "salesforce-connector" {
-  source           = "./salesforce-connector"
+  source           = "./microservices/salesforce-connector"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1287,7 +1279,7 @@ module "salesforce-connector" {
 }
 
 module "story" {
-  source           = "./story"
+  source           = "./microservices/story"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1304,7 +1296,7 @@ module "story" {
 }
 
 module "subscriptions" {
-  source           = "./subscriptions"
+  source           = "./microservices/subscriptions"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1321,7 +1313,7 @@ module "subscriptions" {
 }
 
 module "task-executor" {
-  source           = "./task-executor"
+  source           = "./microservices/task-executor"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1338,7 +1330,7 @@ module "task-executor" {
 }
 
 module "true-color-tiles" {
-  source           = "./true-color-tiles"
+  source           = "./microservices/true-color-tiles"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1355,7 +1347,7 @@ module "true-color-tiles" {
 }
 
 module "viirs-fires" {
-  source           = "./viirs-fires"
+  source           = "./microservices/viirs-fires"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1373,7 +1365,7 @@ module "viirs-fires" {
 }
 
 module "vocabulary" {
-  source                           = "./vocabulary"
+  source                           = "./microservices/vocabulary"
   api_gateway                      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca                       = var.cluster_ca
   cluster_endpoint                 = var.cluster_endpoint
@@ -1396,7 +1388,7 @@ module "vocabulary" {
 }
 
 module "webshot" {
-  source           = "./webshot"
+  source           = "./microservices/webshot"
   api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca       = var.cluster_ca
   cluster_endpoint = var.cluster_endpoint
@@ -1413,7 +1405,7 @@ module "webshot" {
 }
 
 module "widget" {
-  source                 = "./widget"
+  source                 = "./microservices/widget"
   api_gateway            = aws_api_gateway_rest_api.rw_api_gateway
   cluster_ca             = var.cluster_ca
   cluster_endpoint       = var.cluster_endpoint
@@ -1486,7 +1478,8 @@ resource "aws_api_gateway_domain_name" "aws_env_resourcewatch_org_gateway_domain
   security_policy = "TLS_1_2"
 
   depends_on = [
-  aws_acm_certificate_validation.aws_env_resourcewatch_org_domain_cert_validation]
+    aws_acm_certificate_validation.aws_env_resourcewatch_org_domain_cert_validation
+  ]
 }
 
 resource "aws_api_gateway_base_path_mapping" "aws_env_resourcewatch_org_base_path_mapping" {
@@ -1535,7 +1528,8 @@ resource "aws_api_gateway_domain_name" "env_api_resourcewatch_org_gateway_domain
   security_policy = "TLS_1_2"
 
   depends_on = [
-  aws_acm_certificate_validation.env_api_resourcewatch_org_domain_cert_validation]
+    aws_acm_certificate_validation.env_api_resourcewatch_org_domain_cert_validation
+  ]
 }
 
 resource "aws_api_gateway_base_path_mapping" "env_api_resourcewatch_org_base_path_mapping" {
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/analysis-gee/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/main.tf
similarity index 94%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/analysis-gee/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/main.tf
index 01f4adb5..6bf67188 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/analysis-gee/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/main.tf
@@ -332,7 +332,7 @@ module "v2_landsat_tiles_proxy_resource" {
 }
 
 module "analysis_gee_get_v1_recent_tiles_classifier" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_recent_tiles_classifier_resource.aws_api_gateway_resource
@@ -343,7 +343,7 @@ module "analysis_gee_get_v1_recent_tiles_classifier" {
 }
 
 module "analysis_gee_get_v1_composite_service" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_composite_service_resource.aws_api_gateway_resource
@@ -354,7 +354,7 @@ module "analysis_gee_get_v1_composite_service" {
 }
 
 module "analysis_gee_post_v1_mc_analysis" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_mc_analysis_resource.aws_api_gateway_resource
@@ -365,7 +365,7 @@ module "analysis_gee_post_v1_mc_analysis" {
 }
 
 module "analysis_gee_get_v1_composite_service_geom" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_composite_service_geom_resource.aws_api_gateway_resource
@@ -376,7 +376,7 @@ module "analysis_gee_get_v1_composite_service_geom" {
 }
 
 module "analysis_gee_post_v1_composite_service_geom" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_composite_service_geom_resource.aws_api_gateway_resource
@@ -387,7 +387,7 @@ module "analysis_gee_post_v1_composite_service_geom" {
 }
 
 module "analysis_gee_get_v1_geodescriber" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_geodescriber_resource.aws_api_gateway_resource
@@ -398,7 +398,7 @@ module "analysis_gee_get_v1_geodescriber" {
 }
 
 module "analysis_gee_get_v1_geodescriber_geom" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_geodescriber_geom_resource.aws_api_gateway_resource
@@ -409,7 +409,7 @@ module "analysis_gee_get_v1_geodescriber_geom" {
 }
 
 module "analysis_gee_post_v1_geodescriber_geom" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_geodescriber_geom_resource.aws_api_gateway_resource
@@ -420,7 +420,7 @@ module "analysis_gee_post_v1_geodescriber_geom" {
 }
 
 module "analysis_gee_get_v1_umd_loss_gain" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_umd_loss_gain_resource.aws_api_gateway_resource
@@ -431,7 +431,7 @@ module "analysis_gee_get_v1_umd_loss_gain" {
 }
 
 module "analysis_gee_post_v1_umd_loss_gain" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_umd_loss_gain_resource.aws_api_gateway_resource
@@ -442,7 +442,7 @@ module "analysis_gee_post_v1_umd_loss_gain" {
 }
 
 module "analysis_gee_any_v1_umd_loss_gain_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_umd_loss_gain_proxy_resource.aws_api_gateway_resource
@@ -453,7 +453,7 @@ module "analysis_gee_any_v1_umd_loss_gain_proxy" {
 }
 
 module "analysis_gee_get_v1_whrc_biomass" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_whrc_biomass_resource.aws_api_gateway_resource
@@ -464,7 +464,7 @@ module "analysis_gee_get_v1_whrc_biomass" {
 }
 
 module "analysis_gee_post_v1_whrc_biomass" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_whrc_biomass_resource.aws_api_gateway_resource
@@ -475,7 +475,7 @@ module "analysis_gee_post_v1_whrc_biomass" {
 }
 
 module "analysis_gee_any_v1_whrc_biomass_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_whrc_biomass_proxy_resource.aws_api_gateway_resource
@@ -486,7 +486,7 @@ module "analysis_gee_any_v1_whrc_biomass_proxy" {
 }
 
 module "analysis_gee_post_v1_mangrove_biomass" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_mangrove_biomass_resource.aws_api_gateway_resource
@@ -497,7 +497,7 @@ module "analysis_gee_post_v1_mangrove_biomass" {
 }
 
 module "analysis_gee_get_v1_mangrove_biomass" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_mangrove_biomass_resource.aws_api_gateway_resource
@@ -508,7 +508,7 @@ module "analysis_gee_get_v1_mangrove_biomass" {
 }
 
 module "analysis_gee_any_v1_mangrove_biomass_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_mangrove_biomass_proxy_resource.aws_api_gateway_resource
@@ -519,7 +519,7 @@ module "analysis_gee_any_v1_mangrove_biomass_proxy" {
 }
 
 module "analysis_gee_get_v1_population" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_population_resource.aws_api_gateway_resource
@@ -530,7 +530,7 @@ module "analysis_gee_get_v1_population" {
 }
 
 module "analysis_gee_post_v1_population" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_population_resource.aws_api_gateway_resource
@@ -541,7 +541,7 @@ module "analysis_gee_post_v1_population" {
 }
 
 module "analysis_gee_any_v1_population_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_population_proxy_resource.aws_api_gateway_resource
@@ -552,7 +552,7 @@ module "analysis_gee_any_v1_population_proxy" {
 }
 
 module "analysis_gee_get_v1_soil_carbon" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_soil_carbon_resource.aws_api_gateway_resource
@@ -563,7 +563,7 @@ module "analysis_gee_get_v1_soil_carbon" {
 }
 
 module "analysis_gee_any_v1_soil_carbon_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_soil_carbon_proxy_resource.aws_api_gateway_resource
@@ -574,7 +574,7 @@ module "analysis_gee_any_v1_soil_carbon_proxy" {
 }
 
 module "analysis_gee_post_v1_forma250gfw" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_forma250gfw_resource.aws_api_gateway_resource
@@ -585,7 +585,7 @@ module "analysis_gee_post_v1_forma250gfw" {
 }
 
 module "analysis_gee_get_v1_forma250gfw" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_forma250gfw_resource.aws_api_gateway_resource
@@ -596,7 +596,7 @@ module "analysis_gee_get_v1_forma250gfw" {
 }
 
 module "analysis_gee_any_v1_forma250gfw_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_forma250gfw_proxy_resource.aws_api_gateway_resource
@@ -607,7 +607,7 @@ module "analysis_gee_any_v1_forma250gfw_proxy" {
 }
 
 module "analysis_gee_get_v1_biomass_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_biomass_loss_resource.aws_api_gateway_resource
@@ -618,7 +618,7 @@ module "analysis_gee_get_v1_biomass_loss" {
 }
 
 module "analysis_gee_post_v1_biomass_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_biomass_loss_resource.aws_api_gateway_resource
@@ -629,7 +629,7 @@ module "analysis_gee_post_v1_biomass_loss" {
 }
 
 module "analysis_gee_any_v1_biomass_loss_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_biomass_loss_proxy_resource.aws_api_gateway_resource
@@ -640,7 +640,7 @@ module "analysis_gee_any_v1_biomass_loss_proxy" {
 }
 
 module "analysis_gee_get_v1_loss_by_landcover" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_loss_by_landcover_resource.aws_api_gateway_resource
@@ -651,7 +651,7 @@ module "analysis_gee_get_v1_loss_by_landcover" {
 }
 
 module "analysis_gee_post_v1_loss_by_landcover" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_loss_by_landcover_resource.aws_api_gateway_resource
@@ -662,7 +662,7 @@ module "analysis_gee_post_v1_loss_by_landcover" {
 }
 
 module "analysis_gee_get_v1_landcover" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_landcover_resource.aws_api_gateway_resource
@@ -673,7 +673,7 @@ module "analysis_gee_get_v1_landcover" {
 }
 
 module "analysis_gee_post_v1_landcover" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_landcover_resource.aws_api_gateway_resource
@@ -684,7 +684,7 @@ module "analysis_gee_post_v1_landcover" {
 }
 
 module "analysis_gee_any_v1_landsat_tiles_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_landsat_tiles_proxy_resource.aws_api_gateway_resource
@@ -695,7 +695,7 @@ module "analysis_gee_any_v1_landsat_tiles_proxy" {
 }
 
 module "analysis_gee_get_v1_sentinel_tiles" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_sentinel_tiles_resource.aws_api_gateway_resource
@@ -706,7 +706,7 @@ module "analysis_gee_get_v1_sentinel_tiles" {
 }
 
 module "analysis_gee_get_v1_recent_tiles" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_recent_tiles_resource.aws_api_gateway_resource
@@ -717,7 +717,7 @@ module "analysis_gee_get_v1_recent_tiles" {
 }
 
 module "analysis_gee_any_v1_recent_tiles_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_recent_tiles_proxy_resource.aws_api_gateway_resource
@@ -728,7 +728,7 @@ module "analysis_gee_any_v1_recent_tiles_proxy" {
 }
 
 module "analysis_gee_any_v2_landsat_tiles_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_landsat_tiles_proxy_resource.aws_api_gateway_resource
@@ -739,7 +739,7 @@ module "analysis_gee_any_v2_landsat_tiles_proxy" {
 }
 
 module "analysis_gee_get_v2_nlcd_landcover" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_nlcd_landcover_resource.aws_api_gateway_resource
@@ -750,7 +750,7 @@ module "analysis_gee_get_v2_nlcd_landcover" {
 }
 
 module "analysis_gee_post_v2_nlcd_landcover" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_nlcd_landcover_resource.aws_api_gateway_resource
@@ -761,7 +761,7 @@ module "analysis_gee_post_v2_nlcd_landcover" {
 }
 
 module "analysis_gee_any_v2_nlcd_landcover_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_nlcd_landcover_proxy_resource.aws_api_gateway_resource
@@ -772,7 +772,7 @@ module "analysis_gee_any_v2_nlcd_landcover_proxy" {
 }
 
 module "analysis_gee_get_v2_biomass_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_biomass_loss_resource.aws_api_gateway_resource
@@ -783,7 +783,7 @@ module "analysis_gee_get_v2_biomass_loss" {
 }
 
 module "analysis_gee_post_v2_biomass_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_biomass_loss_resource.aws_api_gateway_resource
@@ -794,7 +794,7 @@ module "analysis_gee_post_v2_biomass_loss" {
 }
 
 module "analysis_gee_any_v2_biomass_loss_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_biomass_loss_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/analysis-gee/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/analysis-gee/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/analysis-gee/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/analysis-gee/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/aqueduct-analysis/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/aqueduct-analysis/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/main.tf
index dcbbd400..3de8aca0 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/aqueduct-analysis/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/main.tf
@@ -81,7 +81,7 @@ module "v1_aqueduct_proxy_resource" {
 }
 
 module "aqueduct_analysis_any_v1_aqueduct_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_aqueduct_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/aqueduct-analysis/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/aqueduct-analysis/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/aqueduct-analysis/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/aqueduct-analysis/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis-proxy/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis-proxy/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/main.tf
index e7b2592d..f993921f 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis-proxy/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/main.tf
@@ -81,7 +81,7 @@ module "v1_arcgis_proxy_proxy_resource" {
 }
 
 module "arcgis_proxy_any_v1_arcgis_proxy_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_arcgis_proxy_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis-proxy/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis-proxy/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis-proxy/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis-proxy/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/main.tf
similarity index 96%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/main.tf
index 099b1202..455e366a 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/main.tf
@@ -129,7 +129,7 @@ module "v1_rest_datasets_featureservice_dataset_id_resource" {
 }
 
 module "arcgis_get_v1_query_featureservice_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_query_featureservice_dataset_id_resource.aws_api_gateway_resource
@@ -140,7 +140,7 @@ module "arcgis_get_v1_query_featureservice_dataset_id" {
 }
 
 module "arcgis_post_v1_query_featureservice_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_query_featureservice_dataset_id_resource.aws_api_gateway_resource
@@ -151,7 +151,7 @@ module "arcgis_post_v1_query_featureservice_dataset_id" {
 }
 
 module "arcgis_get_v1_download_featureservice_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_download_featureservice_dataset_id_resource.aws_api_gateway_resource
@@ -162,7 +162,7 @@ module "arcgis_get_v1_download_featureservice_dataset_id" {
 }
 
 module "arcgis_post_v1_download_featureservice_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_download_featureservice_dataset_id_resource.aws_api_gateway_resource
@@ -173,7 +173,7 @@ module "arcgis_post_v1_download_featureservice_dataset_id" {
 }
 
 module "arcgis_get_v1_fields_featureservice_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_fields_featureservice_dataset_id_resource.aws_api_gateway_resource
@@ -184,7 +184,7 @@ module "arcgis_get_v1_fields_featureservice_dataset_id" {
 }
 
 module "arcgis_post_v1_rest_datasets_featureservice" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_rest_datasets_featureservice_resource.aws_api_gateway_resource
@@ -195,7 +195,7 @@ module "arcgis_post_v1_rest_datasets_featureservice" {
 }
 
 module "arcgis_delete_v1_rest_datasets_featureservice_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_rest_datasets_featureservice_dataset_id_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/area/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/area/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/main.tf
index b9eaf5d0..6442702c 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/area/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/main.tf
@@ -131,7 +131,7 @@ module "v1_download_tiles_proxy_resource" {
 }
 
 module "area_get_area_v2" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_area_resource.aws_api_gateway_resource
@@ -142,7 +142,7 @@ module "area_get_area_v2" {
 }
 
 module "area_post_area_v2" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_area_resource.aws_api_gateway_resource
@@ -153,7 +153,7 @@ module "area_post_area_v2" {
 }
 
 module "area_any_area_v2_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_area_proxy_resource.aws_api_gateway_resource
@@ -164,7 +164,7 @@ module "area_any_area_v2_proxy" {
 }
 
 module "area_get_v1_area" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_area_resource.aws_api_gateway_resource
@@ -175,7 +175,7 @@ module "area_get_v1_area" {
 }
 
 module "area_post_v1_area" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_area_resource.aws_api_gateway_resource
@@ -186,7 +186,7 @@ module "area_post_v1_area" {
 }
 
 module "area_any_v1_area_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_area_proxy_resource.aws_api_gateway_resource
@@ -197,7 +197,7 @@ module "area_any_v1_area_proxy" {
 }
 
 module "area_any_v1_download_tiles_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_download_tiles_proxy_resource.aws_api_gateway_resource
@@ -208,7 +208,7 @@ module "area_any_v1_download_tiles_proxy" {
 }
 
 module "area_any_v2_download_tiles_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_download_tiles_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/area/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/area/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/area/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/area/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorization/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/main.tf
similarity index 97%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorization/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/main.tf
index 1d7fafba..dc5a0215 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorization/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/main.tf
@@ -145,7 +145,7 @@ module "v1_application_proxy_resource" {
 }
 
 module "authorization_any_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.authorization_proxy_resource.aws_api_gateway_resource
@@ -156,7 +156,7 @@ module "authorization_any_proxy" {
 }
 
 module "authorization_get" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.authorization_resource.aws_api_gateway_resource
@@ -167,7 +167,7 @@ module "authorization_get" {
 }
 
 module "authorization_get_v1_deletion" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_deletion_resource.aws_api_gateway_resource
@@ -178,7 +178,7 @@ module "authorization_get_v1_deletion" {
 }
 
 module "authorization_post_v1_deletion" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_deletion_resource.aws_api_gateway_resource
@@ -189,7 +189,7 @@ module "authorization_post_v1_deletion" {
 }
 
 module "authorization_any_v1_deletion_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_deletion_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorization/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorization/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorization/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorization/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/bigquery/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/main.tf
similarity index 96%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/bigquery/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/main.tf
index 7bdb4d97..af157515 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/bigquery/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/main.tf
@@ -121,7 +121,7 @@ module "v1_rest_datasets_bigquery_resource" {
 }
 
 module "bigquery_get_v1_query_bigquery_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_query_bigquery_dataset_id_resource.aws_api_gateway_resource
@@ -132,7 +132,7 @@ module "bigquery_get_v1_query_bigquery_dataset_id" {
 }
 
 module "bigquery_post_v1_query_bigquery_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_query_bigquery_dataset_id_resource.aws_api_gateway_resource
@@ -143,7 +143,7 @@ module "bigquery_post_v1_query_bigquery_dataset_id" {
 }
 
 module "bigquery_get_v1_download_bigquery_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_download_bigquery_dataset_id_resource.aws_api_gateway_resource
@@ -154,7 +154,7 @@ module "bigquery_get_v1_download_bigquery_dataset_id" {
 }
 
 module "bigquery_post_v1_download_bigquery_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_download_bigquery_dataset_id_resource.aws_api_gateway_resource
@@ -165,7 +165,7 @@ module "bigquery_post_v1_download_bigquery_dataset_id" {
 }
 
 module "bigquery_get_v1_fields_bigquery_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_fields_bigquery_dataset_id_resource.aws_api_gateway_resource
@@ -176,7 +176,7 @@ module "bigquery_get_v1_fields_bigquery_dataset_id" {
 }
 
 module "bigquery_post_v1_rest_datasets_bigquery" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_rest_datasets_bigquery_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/bigquery/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/bigquery/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/bigquery/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/bigquery/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/biomass/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/biomass/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/main.tf
index b477baea..9543ec9c 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/biomass/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/main.tf
@@ -82,7 +82,7 @@ module "biomass_loss_admin_proxy_resource" {
 
 # Modules
 module "biomass_v1_any_biomass_loss_admin_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.biomass_loss_admin_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/biomass/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/biomass/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/biomass/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/biomass/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/carto/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/main.tf
similarity index 96%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/carto/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/main.tf
index c8873f25..ceda5076 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/carto/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/main.tf
@@ -129,7 +129,7 @@ module "v1_rest_datasets_cartodb_dataset_id_resource" {
 }
 
 module "carto_get_v1_query_cartodb_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_query_cartodb_dataset_id_resource.aws_api_gateway_resource
@@ -140,7 +140,7 @@ module "carto_get_v1_query_cartodb_dataset_id" {
 }
 
 module "carto_post_v1_query_cartodb_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_query_cartodb_dataset_id_resource.aws_api_gateway_resource
@@ -151,7 +151,7 @@ module "carto_post_v1_query_cartodb_dataset_id" {
 }
 
 module "carto_get_v1_download_cartodb_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_download_cartodb_dataset_id_resource.aws_api_gateway_resource
@@ -162,7 +162,7 @@ module "carto_get_v1_download_cartodb_dataset_id" {
 }
 
 module "carto_post_v1_download_cartodb_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_download_cartodb_dataset_id_resource.aws_api_gateway_resource
@@ -173,7 +173,7 @@ module "carto_post_v1_download_cartodb_dataset_id" {
 }
 
 module "carto_get_v1_fields_cartodb_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_fields_cartodb_dataset_id_resource.aws_api_gateway_resource
@@ -184,7 +184,7 @@ module "carto_get_v1_fields_cartodb_dataset_id" {
 }
 
 module "carto_post_v1_rest_datasets_cartodb" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_rest_datasets_cartodb_resource.aws_api_gateway_resource
@@ -195,7 +195,7 @@ module "carto_post_v1_rest_datasets_cartodb" {
 }
 
 module "carto_delete_v1_rest_datasets_cartodb_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_rest_datasets_cartodb_dataset_id_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/carto/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/carto/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/carto/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/carto/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/converter/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/converter/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/main.tf
index 3d8d8879..1d28c0f6 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/converter/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/main.tf
@@ -81,7 +81,7 @@ module "convert_proxy_resource" {
 }
 
 module "converter_any_convert_fs2sql" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.convert_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/converter/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/converter/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/converter/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/converter/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/dataset/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/main.tf
similarity index 84%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/dataset/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/main.tf
index 4606b065..c692c0b8 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/dataset/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/main.tf
@@ -129,7 +129,7 @@ module "dataset_id_proxy_resource" {
 }
 
 module "dataset_get_dataset" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.dataset_resource.aws_api_gateway_resource
@@ -137,10 +137,13 @@ module "dataset_get_dataset" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  authorizer_id   = var.authorizer_id
+  require_api_key = var.require_api_key
+  authorization   = var.authorization
 }
 
 module "dataset_get_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.dataset_id_resource.aws_api_gateway_resource
@@ -148,10 +151,13 @@ module "dataset_get_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  authorizer_id   = var.authorizer_id
+  require_api_key = var.require_api_key
+  authorization   = var.authorization
 }
 
 module "dataset_update_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.dataset_id_resource.aws_api_gateway_resource
@@ -159,10 +165,13 @@ module "dataset_update_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  authorizer_id   = var.authorizer_id
+  require_api_key = var.require_api_key
+  authorization   = var.authorization
 }
 
 module "dataset_delete_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.dataset_id_resource.aws_api_gateway_resource
@@ -170,10 +179,13 @@ module "dataset_delete_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  authorizer_id   = var.authorizer_id
+  require_api_key = var.require_api_key
+  authorization   = var.authorization
 }
 
 module "dataset_post_dataset" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.dataset_resource.aws_api_gateway_resource
@@ -181,6 +193,9 @@ module "dataset_post_dataset" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  authorizer_id   = var.authorizer_id
+  require_api_key = var.require_api_key
+  authorization   = var.authorization
 }
 
 module "dataset_delete_dataset_id_proxy" {
@@ -195,7 +210,7 @@ module "dataset_delete_dataset_id_proxy" {
 }
 
 module "dataset_any_dataset_id_proxy" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_proxy_resource.aws_api_gateway_resource
@@ -204,10 +219,13 @@ module "dataset_any_dataset_id_proxy" {
   vpc_link                    = var.vpc_link
   connection_type             = var.connection_type
   endpoint_request_parameters = ["datasetId"]
+  authorizer_id               = var.authorizer_id
+  require_api_key             = var.require_api_key
+  authorization               = var.authorization
 }
 
 module "dataset_post_dataset_find_by_ids" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.dataset_find_by_ids_resource.aws_api_gateway_resource
@@ -215,10 +233,13 @@ module "dataset_post_dataset_find_by_ids" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset/find-by-ids"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  authorizer_id   = var.authorizer_id
+  require_api_key = var.require_api_key
+  authorization   = var.authorization
 }
 
 module "dataset_post_dataset_upload" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.dataset_upload_resource.aws_api_gateway_resource
@@ -226,4 +247,7 @@ module "dataset_post_dataset_upload" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset/upload"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  authorizer_id   = var.authorizer_id
+  require_api_key = var.require_api_key
+  authorization   = var.authorization
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/dataset/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/dataset/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/dataset/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/variables.tf
similarity index 78%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/dataset/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/variables.tf
index 33f8ec63..459d2565 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/dataset/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/variables.tf
@@ -68,4 +68,27 @@ variable "v1_resource" {
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
+}
+
+variable "authorizer_id" {
+  type    = string
+  default = ""
+}
+
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
+variable "authorization" {
+  default = "NONE"
+  validation {
+    condition = contains([
+      "NONE",
+      "CUSTOM",
+      "AWS_IAM",
+      "COGNITO_USER_POOLS"
+    ], var.authorization)
+    error_message = "Unknown authorization method."
+  }
 }
\ No newline at end of file
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/doc-orchestrator/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/doc-orchestrator/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/main.tf
index 901ce199..1a5b6654 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/doc-orchestrator/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/main.tf
@@ -81,7 +81,7 @@ module "doc_importer_proxy_resource" {
 }
 
 module "doc_orchestrator_any_doc_importer_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.doc_importer_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/doc-orchestrator/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/doc-orchestrator/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/doc-orchestrator/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/doc-orchestrator/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/document-adapter/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/document-adapter/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/main.tf
index d6e31c85..094b2adf 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/document-adapter/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/main.tf
@@ -305,7 +305,7 @@ module "doc_datasets_proxy_resource" {
 }
 
 module "document_adapter_get_query_csv_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_csv_v1_dataset_id_resource.aws_api_gateway_resource
@@ -316,7 +316,7 @@ module "document_adapter_get_query_csv_dataset_id" {
 }
 
 module "document_adapter_post_query_csv_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_csv_v1_dataset_id_resource.aws_api_gateway_resource
@@ -327,7 +327,7 @@ module "document_adapter_post_query_csv_dataset_id" {
 }
 
 module "document_adapter_get_query_json_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_json_v1_dataset_id_resource.aws_api_gateway_resource
@@ -338,7 +338,7 @@ module "document_adapter_get_query_json_dataset_id" {
 }
 
 module "document_adapter_post_query_json_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_json_v1_dataset_id_resource.aws_api_gateway_resource
@@ -349,7 +349,7 @@ module "document_adapter_post_query_json_dataset_id" {
 }
 
 module "document_adapter_get_query_tsv_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_tsv_v1_dataset_id_resource.aws_api_gateway_resource
@@ -360,7 +360,7 @@ module "document_adapter_get_query_tsv_dataset_id" {
 }
 
 module "document_adapter_post_query_tsv_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_tsv_v1_dataset_id_resource.aws_api_gateway_resource
@@ -371,7 +371,7 @@ module "document_adapter_post_query_tsv_dataset_id" {
 }
 
 module "document_adapter_get_query_xml_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_xml_v1_dataset_id_resource.aws_api_gateway_resource
@@ -382,7 +382,7 @@ module "document_adapter_get_query_xml_dataset_id" {
 }
 
 module "document_adapter_post_query_xml_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_xml_v1_dataset_id_resource.aws_api_gateway_resource
@@ -393,7 +393,7 @@ module "document_adapter_post_query_xml_dataset_id" {
 }
 
 module "document_adapter_get_download_csv_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_csv_v1_dataset_id_resource.aws_api_gateway_resource
@@ -404,7 +404,7 @@ module "document_adapter_get_download_csv_dataset_id" {
 }
 
 module "document_adapter_post_download_csv_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_csv_v1_dataset_id_resource.aws_api_gateway_resource
@@ -415,7 +415,7 @@ module "document_adapter_post_download_csv_dataset_id" {
 }
 
 module "document_adapter_get_download_json_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_json_v1_dataset_id_resource.aws_api_gateway_resource
@@ -426,7 +426,7 @@ module "document_adapter_get_download_json_dataset_id" {
 }
 
 module "document_adapter_post_download_json_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_json_v1_dataset_id_resource.aws_api_gateway_resource
@@ -437,7 +437,7 @@ module "document_adapter_post_download_json_dataset_id" {
 }
 
 module "document_adapter_get_download_tsv_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_tsv_v1_dataset_id_resource.aws_api_gateway_resource
@@ -448,7 +448,7 @@ module "document_adapter_get_download_tsv_dataset_id" {
 }
 
 module "document_adapter_post_download_tsv_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_tsv_v1_dataset_id_resource.aws_api_gateway_resource
@@ -459,7 +459,7 @@ module "document_adapter_post_download_tsv_dataset_id" {
 }
 
 module "document_adapter_get_download_xml_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_xml_v1_dataset_id_resource.aws_api_gateway_resource
@@ -470,7 +470,7 @@ module "document_adapter_get_download_xml_dataset_id" {
 }
 
 module "document_adapter_post_download_xml_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_xml_v1_dataset_id_resource.aws_api_gateway_resource
@@ -481,7 +481,7 @@ module "document_adapter_post_download_xml_dataset_id" {
 }
 
 module "document_adapter_get_fields_csv_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.fields_csv_v1_dataset_id_resource.aws_api_gateway_resource
@@ -492,7 +492,7 @@ module "document_adapter_get_fields_csv_dataset_id" {
 }
 
 module "document_adapter_get_fields_json_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.fields_json_v1_dataset_id_resource.aws_api_gateway_resource
@@ -503,7 +503,7 @@ module "document_adapter_get_fields_json_dataset_id" {
 }
 
 module "document_adapter_get_fields_tsv_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.fields_tsv_v1_dataset_id_resource.aws_api_gateway_resource
@@ -514,7 +514,7 @@ module "document_adapter_get_fields_tsv_dataset_id" {
 }
 
 module "document_adapter_get_fields_xml_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.fields_xml_v1_dataset_id_resource.aws_api_gateway_resource
@@ -525,7 +525,7 @@ module "document_adapter_get_fields_xml_dataset_id" {
 }
 
 module "document_adapter_post_dataset_id_concat" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_concat_resource.aws_api_gateway_resource
@@ -537,7 +537,7 @@ module "document_adapter_post_dataset_id_concat" {
 }
 
 module "document_adapter_post_dataset_id_reindex" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_reindex_resource.aws_api_gateway_resource
@@ -549,7 +549,7 @@ module "document_adapter_post_dataset_id_reindex" {
 }
 
 module "document_adapter_post_dataset_id_append" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_append_resource.aws_api_gateway_resource
@@ -561,7 +561,7 @@ module "document_adapter_post_dataset_id_append" {
 }
 
 module "document_adapter_post_dataset_id_data_overwrite" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_data_overwrite_resource.aws_api_gateway_resource
@@ -573,7 +573,7 @@ module "document_adapter_post_dataset_id_data_overwrite" {
 }
 
 module "document_adapter_any_doc_datasets_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.doc_datasets_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/document-adapter/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/document-adapter/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/document-adapter/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/document-adapter/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fires-summary-stats/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/main.tf
similarity index 97%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fires-summary-stats/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/main.tf
index f3eab062..0e354266 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fires-summary-stats/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/main.tf
@@ -105,7 +105,7 @@ module "glad_alerts_summary_stats_proxy_resource" {
 }
 
 module "fires_summary_stats_any_fire_alerts_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.fire_alerts_proxy_resource.aws_api_gateway_resource
@@ -116,7 +116,7 @@ module "fires_summary_stats_any_fire_alerts_proxy" {
 }
 
 module "fires_summary_stats_any_glad_alerts_summary_stats_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.glad_alerts_summary_stats_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fires-summary-stats/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fires-summary-stats/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fires-summary-stats/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fires-summary-stats/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-change/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/main.tf
similarity index 96%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-change/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/main.tf
index 3ba4c512..6351321a 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-change/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/main.tf
@@ -81,7 +81,7 @@ module "v1_terrai_alerts_proxy_resource" {
 }
 
 module "forest_change_get_v1_terrai_alerts" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_terrai_alerts_resource.aws_api_gateway_resource
@@ -92,7 +92,7 @@ module "forest_change_get_v1_terrai_alerts" {
 }
 
 module "forest_change_post_v1_terrai_alerts" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_terrai_alerts_resource.aws_api_gateway_resource
@@ -103,7 +103,7 @@ module "forest_change_post_v1_terrai_alerts" {
 }
 
 module "forest_change_any_v1_terrai_alerts_admin_iso_code" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_terrai_alerts_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-change/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-change/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-change/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-change/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-watcher-api/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-watcher-api/main.tf
similarity index 92%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-watcher-api/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-watcher-api/main.tf
index a9437d6a..96c607bd 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-watcher-api/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-watcher-api/main.tf
@@ -15,7 +15,7 @@ module "v1_forest_watcher_area_resource" {
 }
 
 module "forest_watcher_api_get_v1_forest_watcher_area_resource" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/forest-watcher/area"
   method       = "GET"
@@ -23,7 +23,7 @@ module "forest_watcher_api_get_v1_forest_watcher_area_resource" {
 }
 
 module "forest_watcher_api_post_v1_forest_watcher_area_resource" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/forest-watcher/area"
   method       = "POST"
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-watcher-api/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-watcher-api/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-watcher-api/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-watcher-api/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-watcher-api/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-watcher-api/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-watcher-api/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-watcher-api/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forms/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forms/main.tf
similarity index 91%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/forms/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forms/main.tf
index 23da9a6c..a8483a91 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forms/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forms/main.tf
@@ -31,7 +31,7 @@ module "v1_reports_proxy_resource" {
 }
 
 module "forms_any_v1_questionnaire" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/questionnaire"
   method       = "ANY"
@@ -39,7 +39,7 @@ module "forms_any_v1_questionnaire" {
 }
 
 module "forms_any_v1_questionnaire_proxy" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/questionnaire/{proxy}"
   method       = "ANY"
@@ -47,7 +47,7 @@ module "forms_any_v1_questionnaire_proxy" {
 }
 
 module "forms_any_v1_reports" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/reports"
   method       = "ANY"
@@ -55,7 +55,7 @@ module "forms_any_v1_reports" {
 }
 
 module "forms_any_v1_reports_proxy" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/reports/{proxy}"
   method       = "ANY"
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forms/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forms/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/forms/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forms/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/forms/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forms/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/forms/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forms/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-alerts/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-alerts/main.tf
similarity index 94%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-alerts/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-alerts/main.tf
index 542b32b3..5463dc78 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-alerts/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-alerts/main.tf
@@ -15,7 +15,7 @@ module "v1_fw_alerts_proxy_resource" {
 }
 
 module "fw_alerts_any_v1_form_proxy" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/fw-alerts/{proxy}"
   method       = "ANY"
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-alerts/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-alerts/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-alerts/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-alerts/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-alerts/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-alerts/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-alerts/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-alerts/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-contextual-layers/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-contextual-layers/main.tf
similarity index 91%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-contextual-layers/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-contextual-layers/main.tf
index 5a1f387f..a5ce94ed 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-contextual-layers/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-contextual-layers/main.tf
@@ -15,7 +15,7 @@ module "v1_contextual_layer_proxy_resource" {
 }
 
 module "fw_contextual_layers_get_v1_contextual_layer" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/contextual-layer"
   method       = "GET"
@@ -23,7 +23,7 @@ module "fw_contextual_layers_get_v1_contextual_layer" {
 }
 
 module "fw_contextual_layers_post_v1_contextual_layer" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/contextual-layer"
   method       = "POST"
@@ -31,7 +31,7 @@ module "fw_contextual_layers_post_v1_contextual_layer" {
 }
 
 module "fw_contextual_layers_any_v1_contextual_layer_proxy" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/contextual-layer/{proxy}"
   method       = "ANY"
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-contextual-layers/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-contextual-layers/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-contextual-layers/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-contextual-layers/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-contextual-layers/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-contextual-layers/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-contextual-layers/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-contextual-layers/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-teams/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-teams/main.tf
similarity index 91%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-teams/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-teams/main.tf
index 3d7f2b8f..ebfa237a 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-teams/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-teams/main.tf
@@ -15,7 +15,7 @@ module "v1_teams_proxy_resource" {
 }
 
 module "fw_teams_post_v1_teams" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/teams"
   method       = "POST"
@@ -23,7 +23,7 @@ module "fw_teams_post_v1_teams" {
 }
 
 module "fw_teams_any_v1_teams_proxy" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "${var.backend_url}/v1/teams/{proxy}"
   method       = "ANY"
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-teams/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-teams/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-teams/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-teams/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-teams/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-teams/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/fw-teams/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-teams/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee-tiles/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/main.tf
similarity index 97%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee-tiles/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/main.tf
index eb44de46..51703820 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee-tiles/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/main.tf
@@ -105,7 +105,7 @@ module "gee_layer_gee_proxy_resource" {
 }
 
 module "gee_tiles_any_layer_id_tile_gee_proxy" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.gee_tiles_layer_id_tile_gee_proxy_resource.aws_api_gateway_resource
@@ -117,7 +117,7 @@ module "gee_tiles_any_layer_id_tile_gee_proxy" {
 }
 
 module "gee_tiles_any_gee_layer_gee_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.gee_layer_gee_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee-tiles/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee-tiles/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee-tiles/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee-tiles/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/main.tf
index c8aeabf3..c6d2e03e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/main.tf
@@ -129,7 +129,7 @@ module "rest_datasets_gee_dataset_id_resource" {
 }
 
 module "gee_get_query_gee_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_gee_dataset_id_resource.aws_api_gateway_resource
@@ -140,7 +140,7 @@ module "gee_get_query_gee_dataset_id" {
 }
 
 module "gee_post_query_gee_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_gee_dataset_id_resource.aws_api_gateway_resource
@@ -151,7 +151,7 @@ module "gee_post_query_gee_dataset_id" {
 }
 
 module "gee_get_download_gee_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_gee_dataset_id_resource.aws_api_gateway_resource
@@ -162,7 +162,7 @@ module "gee_get_download_gee_dataset_id" {
 }
 
 module "gee_post_download_gee_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_gee_dataset_id_resource.aws_api_gateway_resource
@@ -173,7 +173,7 @@ module "gee_post_download_gee_dataset_id" {
 }
 
 module "gee_get_fields_gee_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.fields_gee_dataset_id_resource.aws_api_gateway_resource
@@ -184,7 +184,7 @@ module "gee_get_fields_gee_dataset_id" {
 }
 
 module "gee_get_rest_datasets_gee" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.rest_datasets_gee_resource.aws_api_gateway_resource
@@ -195,7 +195,7 @@ module "gee_get_rest_datasets_gee" {
 }
 
 module "gee_delete_rest_datasets_gee_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.rest_datasets_gee_dataset_id_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/geostore/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/main.tf
similarity index 96%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/geostore/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/main.tf
index 7f5b5a82..9eb6589d 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/geostore/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/main.tf
@@ -86,7 +86,7 @@ module "v1_geostore_proxy_resource" {
 }
 
 module "geostore_post_v1_geostore" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_geostore_resource.aws_api_gateway_resource
@@ -97,7 +97,7 @@ module "geostore_post_v1_geostore" {
 }
 
 module "geostore_any_v1_geostore_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_geostore_proxy_resource.aws_api_gateway_resource
@@ -128,7 +128,7 @@ module "v1_coverage_proxy_resource" {
 }
 
 module "geostore_any_v1_coverage_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_coverage_proxy_resource.aws_api_gateway_resource
@@ -159,7 +159,7 @@ module "v2_geostore_proxy_resource" {
 }
 
 module "geostore_post_v2_geostore" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_geostore_resource.aws_api_gateway_resource
@@ -170,7 +170,7 @@ module "geostore_post_v2_geostore" {
 }
 
 module "geostore_any_v2_geostore_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_geostore_proxy_resource.aws_api_gateway_resource
@@ -201,7 +201,7 @@ module "v2_coverage_proxy_resource" {
 }
 
 module "geostore_any_v2_coverage_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_coverage_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/geostore/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/geostore/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/geostore/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/geostore/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-adapter/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/main.tf
similarity index 96%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-adapter/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/main.tf
index bd01d97f..50558941 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-adapter/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/main.tf
@@ -130,7 +130,7 @@ module "v1_rest_datasets_gfw_dataset_id_resource" {
 }
 
 module "gfw_get_v1_query_gfw_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_query_gfw_dataset_id_resource.aws_api_gateway_resource
@@ -141,7 +141,7 @@ module "gfw_get_v1_query_gfw_dataset_id" {
 }
 
 module "gfw_post_v1_query_gfw_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_query_gfw_dataset_id_resource.aws_api_gateway_resource
@@ -152,7 +152,7 @@ module "gfw_post_v1_query_gfw_dataset_id" {
 }
 
 module "gfw_get_v1_download_gfw_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_download_gfw_dataset_id_resource.aws_api_gateway_resource
@@ -163,7 +163,7 @@ module "gfw_get_v1_download_gfw_dataset_id" {
 }
 
 module "gfw_post_v1_download_gfw_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_download_gfw_dataset_id_resource.aws_api_gateway_resource
@@ -174,7 +174,7 @@ module "gfw_post_v1_download_gfw_dataset_id" {
 }
 
 module "gfw_get_v1_fields_gfw_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_fields_gfw_dataset_id_resource.aws_api_gateway_resource
@@ -185,7 +185,7 @@ module "gfw_get_v1_fields_gfw_dataset_id" {
 }
 
 module "gfw_post_v1_rest_datasets_gfw" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_rest_datasets_gfw_resource.aws_api_gateway_resource
@@ -196,7 +196,7 @@ module "gfw_post_v1_rest_datasets_gfw" {
 }
 
 module "gfw_delete_v1_rest_datasets_gfw_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_rest_datasets_gfw_dataset_id_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-adapter/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-adapter/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-adapter/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-adapter/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-contact/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-contact/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/main.tf
index 09f75746..633bc82a 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-contact/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/main.tf
@@ -82,7 +82,7 @@ module "v1_form_proxy_resource" {
 
 
 module "gfw_contact_any_v1_form_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_form_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-contact/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-contact/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-contact/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-contact/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-forma/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/main.tf
similarity index 96%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-forma/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/main.tf
index 99d421b9..33149fd1 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-forma/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/main.tf
@@ -81,7 +81,7 @@ module "v1_forma_alerts_proxy_resource" {
 }
 
 module "gfw_forma_get_v1_forma_alerts" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_forma_alerts_resource.aws_api_gateway_resource
@@ -92,7 +92,7 @@ module "gfw_forma_get_v1_forma_alerts" {
 }
 
 module "gfw_forma_post_v1_forma_alerts" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_forma_alerts_resource.aws_api_gateway_resource
@@ -103,7 +103,7 @@ module "gfw_forma_post_v1_forma_alerts" {
 }
 
 module "gfw_forma_any_v1_forma_alerts_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_forma_alerts_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-forma/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-forma/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-forma/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-forma/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-guira/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-guira/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/main.tf
index 1fd6067e..a15d96e3 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-guira/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/main.tf
@@ -98,7 +98,7 @@ module "v2_guira_loss_proxy_resource" {
 }
 
 module "gfw_guira_get_v2_guira_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_guira_loss_resource.aws_api_gateway_resource
@@ -109,7 +109,7 @@ module "gfw_guira_get_v2_guira_loss" {
 }
 
 module "gfw_guira_post_v2_guira_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_guira_loss_resource.aws_api_gateway_resource
@@ -120,7 +120,7 @@ module "gfw_guira_post_v2_guira_loss" {
 }
 
 module "gfw_guira_any_v2_guira_loss_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_guira_loss_proxy_resource.aws_api_gateway_resource
@@ -131,7 +131,7 @@ module "gfw_guira_any_v2_guira_loss_proxy" {
 }
 
 module "gfw_guira_get_v1_guira_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_guira_loss_resource.aws_api_gateway_resource
@@ -142,7 +142,7 @@ module "gfw_guira_get_v1_guira_loss" {
 }
 
 module "gfw_guira_post_v1_guira_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_guira_loss_resource.aws_api_gateway_resource
@@ -153,7 +153,7 @@ module "gfw_guira_post_v1_guira_loss" {
 }
 
 module "gfw_guira_any_v1_guira_loss_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_guira_loss_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-guira/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-guira/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-guira/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-guira/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-metadata/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-metadata/main.tf
similarity index 94%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-metadata/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-metadata/main.tf
index 86796cbd..e2d14175 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-metadata/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-metadata/main.tf
@@ -19,7 +19,7 @@ module "v1_gfw_metadata_proxy_resource" {
 }
 
 module "v1_gfw_metadata_proxy_endpoint" {
-  source       = "../endpoint-proxy"
+  source       = "../../endpoint-proxy"
   api_gateway  = var.api_gateway
   backend_url  = "http://gis-gfw.wri.org/metadata/{proxy}"
   method       = "ANY"
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-metadata/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-metadata/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-metadata/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-metadata/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-metadata/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-metadata/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-metadata/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-metadata/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr-gfw-pro/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr-gfw-pro/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/main.tf
index 31141d73..3ac31c63 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr-gfw-pro/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/main.tf
@@ -81,7 +81,7 @@ module "v1_gfw_pro_proxy_resource" {
 }
 
 module "gfw_ogr_any_v1_gfw_pro_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_gfw_pro_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr-gfw-pro/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr-gfw-pro/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr-gfw-pro/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr-gfw-pro/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/main.tf
similarity index 97%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/main.tf
index a48b4f55..07bbc0ef 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/main.tf
@@ -98,7 +98,7 @@ module "v2_ogr_proxy_resource" {
 }
 
 module "gfw_ogr_any_v2_ogr_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_ogr_proxy_resource.aws_api_gateway_resource
@@ -109,7 +109,7 @@ module "gfw_ogr_any_v2_ogr_proxy" {
 }
 
 module "gfw_ogr_any_v1_ogr_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_ogr_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-prodes/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-prodes/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/main.tf
index 90f9a255..43f43af0 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-prodes/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/main.tf
@@ -98,7 +98,7 @@ module "v2_prodes_loss_proxy_resource" {
 }
 
 module "gfw_prodes_loss_get_v2_prodes_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_prodes_loss_resource.aws_api_gateway_resource
@@ -109,7 +109,7 @@ module "gfw_prodes_loss_get_v2_prodes_loss" {
 }
 
 module "gfw_prodes_loss_post_v2_prodes_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_prodes_loss_resource.aws_api_gateway_resource
@@ -120,7 +120,7 @@ module "gfw_prodes_loss_post_v2_prodes_loss" {
 }
 
 module "gfw_prodes_loss_any_v2_prodes_loss_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_prodes_loss_proxy_resource.aws_api_gateway_resource
@@ -131,7 +131,7 @@ module "gfw_prodes_loss_any_v2_prodes_loss_proxy" {
 }
 
 module "gfw_prodes_loss_any_v1_prodes_loss_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_prodes_loss_proxy_resource.aws_api_gateway_resource
@@ -142,7 +142,7 @@ module "gfw_prodes_loss_any_v1_prodes_loss_proxy" {
 }
 
 module "gfw_prodes_loss_get_v1_prodes_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_prodes_loss_resource.aws_api_gateway_resource
@@ -153,7 +153,7 @@ module "gfw_prodes_loss_get_v1_prodes_loss" {
 }
 
 module "gfw_prodes_loss_post_v1_prodes_loss" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_prodes_loss_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-prodes/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-prodes/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-prodes/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-prodes/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-umd/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/main.tf
similarity index 97%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-umd/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/main.tf
index 5c3dd132..c53a16fd 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-umd/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/main.tf
@@ -113,7 +113,7 @@ module "v3_umd_loss_proxy_resource" {
 }
 
 module "gfw_umd_loss_any_v1_umd_loss_gain_admin_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_umd_loss_gain_admin_proxy_resource.aws_api_gateway_resource
@@ -124,7 +124,7 @@ module "gfw_umd_loss_any_v1_umd_loss_gain_admin_proxy" {
 }
 
 module "gfw_umd_loss_any_v2_umd_loss_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_umd_loss_proxy_resource.aws_api_gateway_resource
@@ -135,7 +135,7 @@ module "gfw_umd_loss_any_v2_umd_loss_proxy" {
 }
 
 module "gfw_umd_loss_any_v3_umd_loss_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v3_umd_loss_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-umd/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-umd/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-umd/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-umd/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-user/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-user/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/main.tf
index 836cbdc3..bda717e4 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-user/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/main.tf
@@ -97,7 +97,7 @@ module "v2_user_proxy_resource" {
 }
 
 module "gfw_user_get_v1_user" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_user_resource.aws_api_gateway_resource
@@ -108,7 +108,7 @@ module "gfw_user_get_v1_user" {
 }
 
 module "gfw_user_post_v1_user" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_user_resource.aws_api_gateway_resource
@@ -119,7 +119,7 @@ module "gfw_user_post_v1_user" {
 }
 
 module "gfw_user_any_v1_user_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_user_proxy_resource.aws_api_gateway_resource
@@ -130,7 +130,7 @@ module "gfw_user_any_v1_user_proxy" {
 }
 
 module "gfw_user_get_v2_user" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_user_resource.aws_api_gateway_resource
@@ -141,7 +141,7 @@ module "gfw_user_get_v2_user" {
 }
 
 module "gfw_user_post_v2_user" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_user_resource.aws_api_gateway_resource
@@ -152,7 +152,7 @@ module "gfw_user_post_v2_user" {
 }
 
 module "gfw_user_any_v2_user_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_user_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-user/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-user/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-user/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-user/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/glad-analysis-tiled/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/glad-analysis-tiled/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/main.tf
index 57583804..799b597a 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/glad-analysis-tiled/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/main.tf
@@ -129,7 +129,7 @@ module "v1_glad_alerts_use_proxy_resource" {
 }
 
 module "glad_analysis_tiled_any_v1_glad_alerts_admin_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_glad_alerts_admin_proxy_resource.aws_api_gateway_resource
@@ -140,7 +140,7 @@ module "glad_analysis_tiled_any_v1_glad_alerts_admin_proxy" {
 }
 
 module "glad_analysis_tiled_get_v1_glad_alerts_download" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_glad_alerts_download_resource.aws_api_gateway_resource
@@ -151,7 +151,7 @@ module "glad_analysis_tiled_get_v1_glad_alerts_download" {
 }
 
 module "glad_analysis_tiled_post_v1_glad_alerts_download" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_glad_alerts_download_resource.aws_api_gateway_resource
@@ -162,7 +162,7 @@ module "glad_analysis_tiled_post_v1_glad_alerts_download" {
 }
 
 module "glad_analysis_tiled_get_v1_glad_alerts" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = var.v1_glad_alerts_resource
@@ -173,7 +173,7 @@ module "glad_analysis_tiled_get_v1_glad_alerts" {
 }
 
 module "glad_analysis_tiled_post_v1_glad_alerts" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = var.v1_glad_alerts_resource
@@ -184,7 +184,7 @@ module "glad_analysis_tiled_post_v1_glad_alerts" {
 }
 
 module "glad_analysis_tiled_get_v1_glad_alerts_latest" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_glad_alerts_latest_resource.aws_api_gateway_resource
@@ -195,7 +195,7 @@ module "glad_analysis_tiled_get_v1_glad_alerts_latest" {
 }
 
 module "glad_analysis_tiled_any_v1_glad_alerts_wdpa_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_glad_alerts_wdpa_proxy_resource.aws_api_gateway_resource
@@ -206,7 +206,7 @@ module "glad_analysis_tiled_any_v1_glad_alerts_wdpa_proxy" {
 }
 
 module "glad_analysis_tiled_any_v1_glad_alerts_use_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_glad_alerts_use_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/glad-analysis-tiled/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/glad-analysis-tiled/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/glad-analysis-tiled/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/glad-analysis-tiled/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/graph-client/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/graph-client/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/main.tf
index 8d7b8f97..b329def7 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/graph-client/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/main.tf
@@ -82,7 +82,7 @@ module "graph_proxy_resource" {
 }
 
 module "graph_client_any_graph_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.graph_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/graph-client/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/graph-client/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/graph-client/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/graph-client/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gs-pro-config/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gs-pro-config/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/main.tf
index 47d69438..a81c0be9 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gs-pro-config/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/main.tf
@@ -81,7 +81,7 @@ module "v1_pro_config_tech_title_resource" {
 }
 
 module "gs_pro_config_get_v1_pro_config_tech_title" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_pro_config_tech_title_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gs-pro-config/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gs-pro-config/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/gs-pro-config/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/gs-pro-config/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/high-res/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/high-res/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/main.tf
index 11a8d805..eba8df8d 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/high-res/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/main.tf
@@ -81,7 +81,7 @@ module "v1_high_res_sensor_resource" {
 }
 
 module "high_res_get_v1_high_res_sensor" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_high_res_sensor_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/high-res/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/high-res/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/high-res/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/high-res/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/imazon/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/imazon/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/main.tf
index fd54271e..aea963c6 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/imazon/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/main.tf
@@ -98,7 +98,7 @@ module "v2_imazon_alerts_proxy_resource" {
 }
 
 module "imazon_get_v1_imazon_alerts" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_imazon_alerts_resource.aws_api_gateway_resource
@@ -109,7 +109,7 @@ module "imazon_get_v1_imazon_alerts" {
 }
 
 module "imazon_post_v1_imazon_alerts" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_imazon_alerts_resource.aws_api_gateway_resource
@@ -120,7 +120,7 @@ module "imazon_post_v1_imazon_alerts" {
 }
 
 module "imazon_any_v1_imazon_alerts_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_imazon_alerts_proxy_resource.aws_api_gateway_resource
@@ -131,7 +131,7 @@ module "imazon_any_v1_imazon_alerts_proxy" {
 }
 
 module "imazon_get_v2_imazon_alerts" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_imazon_alerts_resource.aws_api_gateway_resource
@@ -142,7 +142,7 @@ module "imazon_get_v2_imazon_alerts" {
 }
 
 module "imazon_post_v2_imazon_alerts" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_imazon_alerts_resource.aws_api_gateway_resource
@@ -153,7 +153,7 @@ module "imazon_post_v2_imazon_alerts" {
 }
 
 module "imazon_any_v2_imazon_alerts_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_imazon_alerts_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/imazon/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/imazon/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/imazon/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/imazon/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/layer/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/layer/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/main.tf
index fcea3e2c..a6e493e9 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/layer/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/main.tf
@@ -146,7 +146,7 @@ module "layer_id_expire_cache_resource" {
 }
 
 module "layer_get" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.layer_resource.aws_api_gateway_resource
@@ -157,7 +157,7 @@ module "layer_get" {
 }
 
 module "layer_get_dataset_id_layer" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_resource.aws_api_gateway_resource
@@ -169,7 +169,7 @@ module "layer_get_dataset_id_layer" {
 }
 
 module "layer_get_dataset_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_id_resource.aws_api_gateway_resource
@@ -181,7 +181,7 @@ module "layer_get_dataset_id" {
 }
 
 module "layer_get_layer_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.layer_id_resource.aws_api_gateway_resource
@@ -192,7 +192,7 @@ module "layer_get_layer_id" {
 }
 
 module "layer_post_dataset_id_layer" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_resource.aws_api_gateway_resource
@@ -204,7 +204,7 @@ module "layer_post_dataset_id_layer" {
 }
 
 module "layer_delete_dataset_id_layer" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_resource.aws_api_gateway_resource
@@ -216,7 +216,7 @@ module "layer_delete_dataset_id_layer" {
 }
 
 module "layer_patch_dataset_id_layer_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_id_resource.aws_api_gateway_resource
@@ -228,7 +228,7 @@ module "layer_patch_dataset_id_layer_id" {
 }
 
 module "layer_any_layer_change_environment_proxy" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.layer_change_environment_proxy_resource.aws_api_gateway_resource
@@ -240,7 +240,7 @@ module "layer_any_layer_change_environment_proxy" {
 }
 
 module "layer_delete_dataset_id_layer_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_id_resource.aws_api_gateway_resource
@@ -252,7 +252,7 @@ module "layer_delete_dataset_id_layer_id" {
 }
 
 module "layer_post_layer_find_by_ids" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.layer_find_by_ids_resource.aws_api_gateway_resource
@@ -274,7 +274,7 @@ module "layer_post_layer_by_user_layer_id" {
 }
 
 module "layer_delete_layer_id_expire_cache" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.layer_id_expire_cache_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/layer/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/layer/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/layer/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/layer/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/metadata/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/main.tf
similarity index 94%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/metadata/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/main.tf
index 4ec4bc31..82e58ae4 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/metadata/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/main.tf
@@ -154,7 +154,7 @@ module "metadata_dataset_id_layer_id_metadata_resource" {
 }
 
 module "metadata_get" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.metadata_resource.aws_api_gateway_resource
@@ -166,7 +166,7 @@ module "metadata_get" {
 
 // Dataset
 module "metadata_get_for_dataset" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_metadata_resource.aws_api_gateway_resource
@@ -178,7 +178,7 @@ module "metadata_get_for_dataset" {
 }
 
 module "metadata_post_for_dataset" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_metadata_resource.aws_api_gateway_resource
@@ -190,7 +190,7 @@ module "metadata_post_for_dataset" {
 }
 
 module "metadata_delete_for_dataset" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_metadata_resource.aws_api_gateway_resource
@@ -202,7 +202,7 @@ module "metadata_delete_for_dataset" {
 }
 
 module "metadata_post_for_dataset_clone" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_metadata_clone_resource.aws_api_gateway_resource
@@ -214,7 +214,7 @@ module "metadata_post_for_dataset_clone" {
 }
 
 module "metadata_patch_for_dataset" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_metadata_resource.aws_api_gateway_resource
@@ -227,7 +227,7 @@ module "metadata_patch_for_dataset" {
 
 // Widget
 module "metadata_get_for_dataset_widget" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_widget_id_metadata_resource.aws_api_gateway_resource
@@ -239,7 +239,7 @@ module "metadata_get_for_dataset_widget" {
 }
 
 module "metadata_post_for_dataset_widget" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_widget_id_metadata_resource.aws_api_gateway_resource
@@ -251,7 +251,7 @@ module "metadata_post_for_dataset_widget" {
 }
 
 module "metadata_delete_for_dataset_widget" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_widget_id_metadata_resource.aws_api_gateway_resource
@@ -263,7 +263,7 @@ module "metadata_delete_for_dataset_widget" {
 }
 
 module "metadata_patch_for_dataset_widget" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_widget_id_metadata_resource.aws_api_gateway_resource
@@ -276,7 +276,7 @@ module "metadata_patch_for_dataset_widget" {
 
 // Layer
 module "metadata_get_for_dataset_layer" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_layer_id_metadata_resource.aws_api_gateway_resource
@@ -288,7 +288,7 @@ module "metadata_get_for_dataset_layer" {
 }
 
 module "metadata_post_for_dataset_layer" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_layer_id_metadata_resource.aws_api_gateway_resource
@@ -300,7 +300,7 @@ module "metadata_post_for_dataset_layer" {
 }
 
 module "metadata_delete_for_dataset_layer" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_layer_id_metadata_resource.aws_api_gateway_resource
@@ -312,7 +312,7 @@ module "metadata_delete_for_dataset_layer" {
 }
 
 module "metadata_patch_for_dataset_layer" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_layer_id_metadata_resource.aws_api_gateway_resource
@@ -325,7 +325,7 @@ module "metadata_patch_for_dataset_layer" {
 
 // Find by ids
 module "metadata_dataset_post_find_by_ids" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.metadata_dataset_metadata_find_by_ids_resource.aws_api_gateway_resource
@@ -336,7 +336,7 @@ module "metadata_dataset_post_find_by_ids" {
 }
 
 module "metadata_layer_post_find_by_ids" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_layer_metadata_find_by_ids_resource.aws_api_gateway_resource
@@ -348,7 +348,7 @@ module "metadata_layer_post_find_by_ids" {
 }
 
 module "metadata_widget_post_find_by_ids" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.metadata_dataset_id_widget_metadata_find_by_ids_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/metadata/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/metadata/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/metadata/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/metadata/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/nexgddp/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/nexgddp/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/main.tf
index 30364df5..dc2769f3 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/nexgddp/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/main.tf
@@ -266,7 +266,7 @@ module "nexgddp_v1_loca_proxy_resource" {
 }
 
 module "nexgddp_get_v1_query_nexgddp_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.nexgddp_v1_query_nexgddp_dataset_id_resource.aws_api_gateway_resource
@@ -277,7 +277,7 @@ module "nexgddp_get_v1_query_nexgddp_dataset_id" {
 }
 
 module "nexgddp_post_v1_query_nexgddp_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.nexgddp_v1_query_nexgddp_dataset_id_resource.aws_api_gateway_resource
@@ -288,7 +288,7 @@ module "nexgddp_post_v1_query_nexgddp_dataset_id" {
 }
 
 module "nexgddp_get_v1_fields_nexgddp_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.nexgddp_v1_fields_nexgddp_dataset_id_resource.aws_api_gateway_resource
@@ -299,7 +299,7 @@ module "nexgddp_get_v1_fields_nexgddp_dataset_id" {
 }
 
 module "nexgddp_post_v1_rest_datasets_nexgddp" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.nexgddp_v1_rest_datasets_nexgddp_resource.aws_api_gateway_resource
@@ -310,7 +310,7 @@ module "nexgddp_post_v1_rest_datasets_nexgddp" {
 }
 
 module "nexgddp_delete_v1_rest_datasets_nexgddp_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.nexgddp_v1_rest_datasets_nexgddp_dataset_id_resource.aws_api_gateway_resource
@@ -321,7 +321,7 @@ module "nexgddp_delete_v1_rest_datasets_nexgddp_dataset_id" {
 }
 
 module "nexgddp_get_v1_query_loca_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.nexgddp_v1_query_loca_dataset_id_resource.aws_api_gateway_resource
@@ -332,7 +332,7 @@ module "nexgddp_get_v1_query_loca_dataset_id" {
 }
 
 module "nexgddp_post_v1_query_loca_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.nexgddp_v1_query_loca_dataset_id_resource.aws_api_gateway_resource
@@ -343,7 +343,7 @@ module "nexgddp_post_v1_query_loca_dataset_id" {
 }
 
 module "nexgddp_get_v1_fields_loca_dataset_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.nexgddp_v1_fields_loca_dataset_id_resource.aws_api_gateway_resource
@@ -354,7 +354,7 @@ module "nexgddp_get_v1_fields_loca_dataset_id" {
 }
 
 module "nexgddp_post_v1_rest_datasets_loca" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.nexgddp_v1_rest_datasets_loca_resource.aws_api_gateway_resource
@@ -365,7 +365,7 @@ module "nexgddp_post_v1_rest_datasets_loca" {
 }
 
 module "nexgddp_any_v1_nexgddp_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.nexgddp_v1_nexgddp_proxy_resource.aws_api_gateway_resource
@@ -376,7 +376,7 @@ module "nexgddp_any_v1_nexgddp_proxy" {
 }
 
 module "nexgddp_any_v1_loca_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.nexgddp_v1_loca_proxy_resource.aws_api_gateway_resource
@@ -387,7 +387,7 @@ module "nexgddp_any_v1_loca_proxy" {
 }
 
 module "gee_tiles_any_layer_id_tile_nexgddp_proxy_resource" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.nexgddp_v1_layer_id_tile_nexgddp_proxy_resource.aws_api_gateway_resource
@@ -399,7 +399,7 @@ module "gee_tiles_any_layer_id_tile_nexgddp_proxy_resource" {
 }
 
 module "gee_tiles_any_layer_id_tile_loca_proxy_resource" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.nexgddp_v1_layer_id_tile_loca_proxy_resource.aws_api_gateway_resource
@@ -411,7 +411,7 @@ module "gee_tiles_any_layer_id_tile_loca_proxy_resource" {
 }
 
 module "gee_tiles_any_layer_nexgddp_proxy_resource" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.nexgddp_layer_nexgddp_proxy_resource.aws_api_gateway_resource
@@ -423,7 +423,7 @@ module "gee_tiles_any_layer_nexgddp_proxy_resource" {
 }
 
 module "gee_tiles_any_layer_loca_proxy_resource" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.nexgddp_layer_loca_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/nexgddp/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/nexgddp/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/nexgddp/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/nexgddp/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/proxy/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/proxy/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/main.tf
index 53e1bda1..f18311f3 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/proxy/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/main.tf
@@ -82,7 +82,7 @@ module "proxy_v1_proxy_proxy_resource" {
 }
 
 module "gee_tiles_any_proxy_v1_proxy_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.proxy_v1_proxy_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/proxy/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/proxy/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/proxy/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/proxy/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/query/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/main.tf
similarity index 94%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/query/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/main.tf
index 9c3f83eb..14fa3033 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/query/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/main.tf
@@ -122,7 +122,7 @@ module "fields_dataset_id_resource" {
 }
 
 module "query_get_query" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_resource.aws_api_gateway_resource
@@ -133,7 +133,7 @@ module "query_get_query" {
 }
 
 module "query_post_query" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_resource.aws_api_gateway_resource
@@ -144,7 +144,7 @@ module "query_post_query" {
 }
 
 module "query_get_query_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_dataset_id_resource.aws_api_gateway_resource
@@ -155,7 +155,7 @@ module "query_get_query_id" {
 }
 
 module "query_post_query_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.query_dataset_id_resource.aws_api_gateway_resource
@@ -166,7 +166,7 @@ module "query_post_query_id" {
 }
 
 module "download_get_download" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_resource.aws_api_gateway_resource
@@ -177,7 +177,7 @@ module "download_get_download" {
 }
 
 module "download_post_download" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_resource.aws_api_gateway_resource
@@ -188,7 +188,7 @@ module "download_post_download" {
 }
 
 module "download_get_download_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_dataset_id_resource.aws_api_gateway_resource
@@ -199,7 +199,7 @@ module "download_get_download_id" {
 }
 
 module "download_post_download_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.download_dataset_id_resource.aws_api_gateway_resource
@@ -210,7 +210,7 @@ module "download_post_download_id" {
 }
 
 module "jiminy_get_jiminy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.jiminy_resource.aws_api_gateway_resource
@@ -221,7 +221,7 @@ module "jiminy_get_jiminy" {
 }
 
 module "jiminy_post_jiminy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.jiminy_resource.aws_api_gateway_resource
@@ -232,7 +232,7 @@ module "jiminy_post_jiminy" {
 }
 
 module "fields_get_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.fields_dataset_id_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/query/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/query/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/query/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/query/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/quicc/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/main.tf
similarity index 97%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/quicc/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/main.tf
index b3eeb561..091c6892 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/quicc/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/main.tf
@@ -81,7 +81,7 @@ module "v1_quicc_alerts_proxy_resource" {
 }
 
 module "quicc_get_v1_quicc_alerts" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_quicc_alerts_resource.aws_api_gateway_resource
@@ -92,7 +92,7 @@ module "quicc_get_v1_quicc_alerts" {
 }
 
 module "quicc_any_v1_quicc_alerts_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_quicc_alerts_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/quicc/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/quicc/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/quicc/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/quicc/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource-watch-manager/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/main.tf
similarity index 93%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource-watch-manager/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/main.tf
index df6be2aa..50b2439b 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource-watch-manager/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/main.tf
@@ -193,7 +193,7 @@ module "v1_contact_us_resource" {
 }
 
 module "resource_watch_manager_get_v1_dashboard" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_dashboard_resource.aws_api_gateway_resource
@@ -204,7 +204,7 @@ module "resource_watch_manager_get_v1_dashboard" {
 }
 
 module "resource_watch_manager_post_v1_dashboard" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_dashboard_resource.aws_api_gateway_resource
@@ -215,7 +215,7 @@ module "resource_watch_manager_post_v1_dashboard" {
 }
 
 module "resource_watch_manager_any_v1_dashboard_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_dashboard_proxy_resource.aws_api_gateway_resource
@@ -226,7 +226,7 @@ module "resource_watch_manager_any_v1_dashboard_proxy" {
 }
 
 module "resource_watch_manager_get_v1_partner" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_partner_resource.aws_api_gateway_resource
@@ -237,7 +237,7 @@ module "resource_watch_manager_get_v1_partner" {
 }
 
 module "resource_watch_manager_post_v1_partner" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_partner_resource.aws_api_gateway_resource
@@ -248,7 +248,7 @@ module "resource_watch_manager_post_v1_partner" {
 }
 
 module "resource_watch_manager_get_v1_partner_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_partner_id_resource.aws_api_gateway_resource
@@ -259,7 +259,7 @@ module "resource_watch_manager_get_v1_partner_id" {
 }
 
 module "resource_watch_manager_patch_v1_partner_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_partner_id_resource.aws_api_gateway_resource
@@ -270,7 +270,7 @@ module "resource_watch_manager_patch_v1_partner_id" {
 }
 
 module "resource_watch_manager_put_v1_partner_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_partner_id_resource.aws_api_gateway_resource
@@ -281,7 +281,7 @@ module "resource_watch_manager_put_v1_partner_id" {
 }
 
 module "resource_watch_manager_delete_v1_partner_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_partner_id_resource.aws_api_gateway_resource
@@ -292,7 +292,7 @@ module "resource_watch_manager_delete_v1_partner_id" {
 }
 
 module "resource_watch_manager_get_v1_static_page" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_static_page_resource.aws_api_gateway_resource
@@ -303,7 +303,7 @@ module "resource_watch_manager_get_v1_static_page" {
 }
 
 module "resource_watch_manager_post_v1_static_page" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_static_page_resource.aws_api_gateway_resource
@@ -314,7 +314,7 @@ module "resource_watch_manager_post_v1_static_page" {
 }
 
 module "resource_watch_manager_get_v1_static_page_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_static_page_id_resource.aws_api_gateway_resource
@@ -325,7 +325,7 @@ module "resource_watch_manager_get_v1_static_page_id" {
 }
 
 module "resource_watch_manager_patch_v1_static_page_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_static_page_id_resource.aws_api_gateway_resource
@@ -336,7 +336,7 @@ module "resource_watch_manager_patch_v1_static_page_id" {
 }
 
 module "resource_watch_manager_put_v1_static_page_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_static_page_id_resource.aws_api_gateway_resource
@@ -347,7 +347,7 @@ module "resource_watch_manager_put_v1_static_page_id" {
 }
 
 module "resource_watch_manager_delete_v1_static_page_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_static_page_id_resource.aws_api_gateway_resource
@@ -358,7 +358,7 @@ module "resource_watch_manager_delete_v1_static_page_id" {
 }
 
 module "resource_watch_manager_get_v1_topic" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_topic_resource.aws_api_gateway_resource
@@ -369,7 +369,7 @@ module "resource_watch_manager_get_v1_topic" {
 }
 
 module "resource_watch_manager_post_v1_topic" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_topic_resource.aws_api_gateway_resource
@@ -380,7 +380,7 @@ module "resource_watch_manager_post_v1_topic" {
 }
 
 module "resource_watch_manager_any_v1_topic_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_topic_proxy_resource.aws_api_gateway_resource
@@ -391,7 +391,7 @@ module "resource_watch_manager_any_v1_topic_proxy" {
 }
 
 module "resource_watch_manager_get_v1_tool" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_tool_resource.aws_api_gateway_resource
@@ -402,7 +402,7 @@ module "resource_watch_manager_get_v1_tool" {
 }
 
 module "resource_watch_manager_post_v1_tool" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_tool_resource.aws_api_gateway_resource
@@ -413,7 +413,7 @@ module "resource_watch_manager_post_v1_tool" {
 }
 
 module "resource_watch_manager_get_v1_tool_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_tool_id_resource.aws_api_gateway_resource
@@ -424,7 +424,7 @@ module "resource_watch_manager_get_v1_tool_id" {
 }
 
 module "resource_watch_manager_patch_v1_tool_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_tool_id_resource.aws_api_gateway_resource
@@ -435,7 +435,7 @@ module "resource_watch_manager_patch_v1_tool_id" {
 }
 
 module "resource_watch_manager_put_v1_tool_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_tool_id_resource.aws_api_gateway_resource
@@ -446,7 +446,7 @@ module "resource_watch_manager_put_v1_tool_id" {
 }
 
 module "resource_watch_manager_delete_v1_tool_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_tool_id_resource.aws_api_gateway_resource
@@ -457,7 +457,7 @@ module "resource_watch_manager_delete_v1_tool_id" {
 }
 
 module "resource_watch_manager_post_v1_profile" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_profile_resource.aws_api_gateway_resource
@@ -468,7 +468,7 @@ module "resource_watch_manager_post_v1_profile" {
 }
 
 module "resource_watch_manager_get_v1_profile_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_profile_id_resource.aws_api_gateway_resource
@@ -479,7 +479,7 @@ module "resource_watch_manager_get_v1_profile_id" {
 }
 
 module "resource_watch_manager_patch_v1_profile_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_profile_id_resource.aws_api_gateway_resource
@@ -490,7 +490,7 @@ module "resource_watch_manager_patch_v1_profile_id" {
 }
 
 module "resource_watch_manager_put_v1_profile_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_profile_id_resource.aws_api_gateway_resource
@@ -501,7 +501,7 @@ module "resource_watch_manager_put_v1_profile_id" {
 }
 
 module "resource_watch_manager_delete_v1_profile_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_profile_id_resource.aws_api_gateway_resource
@@ -512,7 +512,7 @@ module "resource_watch_manager_delete_v1_profile_id" {
 }
 
 module "resource_watch_manager_get_v1_faq" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_faq_resource.aws_api_gateway_resource
@@ -523,7 +523,7 @@ module "resource_watch_manager_get_v1_faq" {
 }
 
 module "resource_watch_manager_post_v1_faq" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_faq_resource.aws_api_gateway_resource
@@ -534,7 +534,7 @@ module "resource_watch_manager_post_v1_faq" {
 }
 
 module "resource_watch_manager_any_v1_faq_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_faq_proxy_resource.aws_api_gateway_resource
@@ -545,7 +545,7 @@ module "resource_watch_manager_any_v1_faq_proxy" {
 }
 
 module "resource_watch_manager_post_v1_temporary_content_image" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_temporary_content_image_resource.aws_api_gateway_resource
@@ -556,7 +556,7 @@ module "resource_watch_manager_post_v1_temporary_content_image" {
 }
 
 module "resource_watch_manager_post_v1_contact_us" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_contact_us_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource-watch-manager/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource-watch-manager/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource-watch-manager/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource-watch-manager/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource/main.tf
similarity index 97%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource/main.tf
index bb83dfec..87487c37 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource/main.tf
@@ -25,7 +25,8 @@ resource "aws_api_gateway_integration" "get_v1_endpoint_integration" {
     EOT
   }
   depends_on = [
-  aws_api_gateway_method.get_v1_endpoint_method]
+    aws_api_gateway_method.get_v1_endpoint_method
+  ]
 }
 
 resource "aws_api_gateway_method_response" "get_v1_endpoint_method_response" {
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/rw-lp/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/main.tf
similarity index 97%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/rw-lp/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/main.tf
index 39ae72c7..bebd9d54 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/rw-lp/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/main.tf
@@ -88,7 +88,7 @@ module "rw_lp_proxy_resource" {
 }
 
 module "rw_lp_get_home" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = data.aws_api_gateway_resource.root_resource
@@ -99,7 +99,7 @@ module "rw_lp_get_home" {
 }
 
 module "rw_lp_get_rw_lp_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.rw_lp_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/rw-lp/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/rw-lp/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/rw-lp/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/rw-lp/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/salesforce-connector/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/salesforce-connector/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/main.tf
index 78e76ce2..dabf443b 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/salesforce-connector/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/main.tf
@@ -81,7 +81,7 @@ module "v1_salesforce_proxy_resource" {
 }
 
 module "salesforce_connector_any_v1_user_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_salesforce_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/salesforce-connector/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/salesforce-connector/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/salesforce-connector/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/salesforce-connector/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/story/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/main.tf
similarity index 96%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/story/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/main.tf
index fdba9f6d..a73848eb 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/story/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/main.tf
@@ -81,7 +81,7 @@ module "v1_story_proxy_resource" {
 }
 
 module "story_get_v1_story" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_story_resource.aws_api_gateway_resource
@@ -92,7 +92,7 @@ module "story_get_v1_story" {
 }
 
 module "story_post_v1_story" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_story_resource.aws_api_gateway_resource
@@ -103,7 +103,7 @@ module "story_post_v1_story" {
 }
 
 module "story_any_v1_story_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_story_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/story/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/story/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/story/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/story/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/subscriptions/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/main.tf
similarity index 96%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/subscriptions/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/main.tf
index 32b914f3..19717fe5 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/subscriptions/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/main.tf
@@ -81,7 +81,7 @@ module "v1_subscriptions_proxy_resource" {
 }
 
 module "subscriptions_get_v1_subscriptions" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_subscriptions_resource.aws_api_gateway_resource
@@ -92,7 +92,7 @@ module "subscriptions_get_v1_subscriptions" {
 }
 
 module "subscriptions_post_v1_subscriptions" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_subscriptions_resource.aws_api_gateway_resource
@@ -103,7 +103,7 @@ module "subscriptions_post_v1_subscriptions" {
 }
 
 module "subscriptions_any_v1_subscriptions_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_subscriptions_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/subscriptions/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/subscriptions/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/subscriptions/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/subscriptions/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/task-executor/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/main.tf
similarity index 97%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/task-executor/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/main.tf
index 79404f04..886c1d0e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/task-executor/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/main.tf
@@ -82,7 +82,7 @@ module "task_proxy_resource" {
 }
 
 module "task_async_get_task" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.task_resource.aws_api_gateway_resource
@@ -93,7 +93,7 @@ module "task_async_get_task" {
 }
 
 module "task_async_any_task_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.task_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/task-executor/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/task-executor/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/task-executor/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/task-executor/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/true-color-tiles/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/main.tf
similarity index 98%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/true-color-tiles/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/main.tf
index f6191013..d8ff4a7f 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/true-color-tiles/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/main.tf
@@ -81,7 +81,7 @@ module "v1_true_color_tiles_proxy_resource" {
 }
 
 module "true_color_tiles_get_v1_true_color_tiles_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_true_color_tiles_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/true-color-tiles/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/true-color-tiles/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/true-color-tiles/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/true-color-tiles/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/viirs-fires/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/viirs-fires/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/main.tf
index 3d125010..fe0ce224 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/viirs-fires/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/main.tf
@@ -99,7 +99,7 @@ module "v2_viirs_active_fires_proxy_resource" {
 }
 
 module "viirs_fires_get_v1_viirs_active_fires" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_viirs_active_fires_resource.aws_api_gateway_resource
@@ -110,7 +110,7 @@ module "viirs_fires_get_v1_viirs_active_fires" {
 }
 
 module "viirs_fires_post_v1_viirs_active_fires" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_viirs_active_fires_resource.aws_api_gateway_resource
@@ -121,7 +121,7 @@ module "viirs_fires_post_v1_viirs_active_fires" {
 }
 
 module "viirs_fires_any_v1_viirs_active_fires_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_viirs_active_fires_proxy_resource.aws_api_gateway_resource
@@ -132,7 +132,7 @@ module "viirs_fires_any_v1_viirs_active_fires_proxy" {
 }
 
 module "viirs_fires_get_v2_viirs_active_fires" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_viirs_active_fires_resource.aws_api_gateway_resource
@@ -143,7 +143,7 @@ module "viirs_fires_get_v2_viirs_active_fires" {
 }
 
 module "viirs_fires_post_v2_viirs_active_fires" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_viirs_active_fires_resource.aws_api_gateway_resource
@@ -154,7 +154,7 @@ module "viirs_fires_post_v2_viirs_active_fires" {
 }
 
 module "viirs_fires_any_v2_viirs_active_fires_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v2_viirs_active_fires_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/viirs-fires/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/viirs-fires/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/viirs-fires/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/viirs-fires/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/vocabulary/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/main.tf
similarity index 94%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/vocabulary/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/main.tf
index 7c07dc36..7d7b4848 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/vocabulary/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/main.tf
@@ -86,7 +86,7 @@ module "vocabulary_proxy_resource" {
 }
 
 module "vocabulary_get_vocabulary" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.vocabulary_resource.aws_api_gateway_resource
@@ -97,7 +97,7 @@ module "vocabulary_get_vocabulary" {
 }
 
 module "vocabulary_post_vocabulary" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.vocabulary_resource.aws_api_gateway_resource
@@ -108,7 +108,7 @@ module "vocabulary_post_vocabulary" {
 }
 
 module "vocabulary_any_vocabulary_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.vocabulary_proxy_resource.aws_api_gateway_resource
@@ -155,7 +155,7 @@ module "dataset_vocabulary_proxy_resource" {
 }
 
 module "vocabulary_get_dataset_id_vocabulary" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_vocabulary_resource.aws_api_gateway_resource
@@ -167,7 +167,7 @@ module "vocabulary_get_dataset_id_vocabulary" {
 }
 
 module "vocabulary_post_dataset_id_vocabulary" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_vocabulary_resource.aws_api_gateway_resource
@@ -179,7 +179,7 @@ module "vocabulary_post_dataset_id_vocabulary" {
 }
 
 module "vocabulary_put_dataset_id_vocabulary" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_vocabulary_resource.aws_api_gateway_resource
@@ -191,7 +191,7 @@ module "vocabulary_put_dataset_id_vocabulary" {
 }
 
 module "vocabulary_any_dataset_id_vocabulary_proxy" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_vocabulary_proxy_resource.aws_api_gateway_resource
@@ -203,7 +203,7 @@ module "vocabulary_any_dataset_id_vocabulary_proxy" {
 }
 
 module "vocabulary_delete_dataset_id_vocabulary" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_vocabulary_resource.aws_api_gateway_resource
@@ -215,7 +215,7 @@ module "vocabulary_delete_dataset_id_vocabulary" {
 }
 
 module "vocabulary_any_dataset_vocabulary_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.dataset_vocabulary_proxy_resource.aws_api_gateway_resource
@@ -262,7 +262,7 @@ module "dataset_id_widget_vocabulary_proxy_resource" {
 }
 
 module "vocabulary_get_dataset_id_widget_id_vocabulary" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_widget_id_vocabulary_resource.aws_api_gateway_resource
@@ -274,7 +274,7 @@ module "vocabulary_get_dataset_id_widget_id_vocabulary" {
 }
 
 module "vocabulary_get_dataset_id_widget_id_vocabulary_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_widget_id_vocabulary_id_resource.aws_api_gateway_resource
@@ -286,7 +286,7 @@ module "vocabulary_get_dataset_id_widget_id_vocabulary_id" {
 }
 
 module "vocabulary_post_dataset_id_widget_id_vocabulary" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_widget_id_vocabulary_resource.aws_api_gateway_resource
@@ -298,7 +298,7 @@ module "vocabulary_post_dataset_id_widget_id_vocabulary" {
 }
 
 module "vocabulary_post_dataset_id_widget_id_vocabulary_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_widget_id_vocabulary_id_resource.aws_api_gateway_resource
@@ -310,7 +310,7 @@ module "vocabulary_post_dataset_id_widget_id_vocabulary_id" {
 }
 
 module "vocabulary_patch_dataset_id_widget_id_vocabulary_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_widget_id_vocabulary_id_resource.aws_api_gateway_resource
@@ -322,7 +322,7 @@ module "vocabulary_patch_dataset_id_widget_id_vocabulary_id" {
 }
 
 module "vocabulary_delete_dataset_id_widget_id_vocabulary" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_widget_id_vocabulary_resource.aws_api_gateway_resource
@@ -334,7 +334,7 @@ module "vocabulary_delete_dataset_id_widget_id_vocabulary" {
 }
 
 module "vocabulary_delete_dataset_id_widget_id_vocabulary_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_widget_id_vocabulary_id_resource.aws_api_gateway_resource
@@ -346,7 +346,7 @@ module "vocabulary_delete_dataset_id_widget_id_vocabulary_id" {
 }
 
 module "vocabulary_any_dataset_id_widget_vocabulary_proxy" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_widget_vocabulary_proxy_resource.aws_api_gateway_resource
@@ -394,7 +394,7 @@ module "dataset_id_layer_vocabulary_proxy_resource" {
 }
 
 module "vocabulary_get_dataset_id_layer_id_vocabulary" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_id_vocabulary_resource.aws_api_gateway_resource
@@ -406,7 +406,7 @@ module "vocabulary_get_dataset_id_layer_id_vocabulary" {
 }
 
 module "vocabulary_get_dataset_id_layer_id_vocabulary_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_id_vocabulary_id_resource.aws_api_gateway_resource
@@ -418,7 +418,7 @@ module "vocabulary_get_dataset_id_layer_id_vocabulary_id" {
 }
 
 module "vocabulary_post_dataset_id_layer_id_vocabulary" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_id_vocabulary_resource.aws_api_gateway_resource
@@ -430,7 +430,7 @@ module "vocabulary_post_dataset_id_layer_id_vocabulary" {
 }
 
 module "vocabulary_post_dataset_id_layer_id_vocabulary_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_id_vocabulary_id_resource.aws_api_gateway_resource
@@ -442,7 +442,7 @@ module "vocabulary_post_dataset_id_layer_id_vocabulary_id" {
 }
 
 module "vocabulary_patch_dataset_id_layer_id_vocabulary_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_id_vocabulary_id_resource.aws_api_gateway_resource
@@ -454,7 +454,7 @@ module "vocabulary_patch_dataset_id_layer_id_vocabulary_id" {
 }
 
 module "vocabulary_delete_dataset_id_layer_id_vocabulary" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_id_vocabulary_resource.aws_api_gateway_resource
@@ -466,7 +466,7 @@ module "vocabulary_delete_dataset_id_layer_id_vocabulary" {
 }
 
 module "vocabulary_delete_dataset_id_layer_id_vocabulary_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_id_vocabulary_id_resource.aws_api_gateway_resource
@@ -478,7 +478,7 @@ module "vocabulary_delete_dataset_id_layer_id_vocabulary_id" {
 }
 
 module "vocabulary_any_dataset_id_layer_vocabulary_proxy" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_layer_vocabulary_proxy_resource.aws_api_gateway_resource
@@ -510,7 +510,7 @@ module "favourite_proxy_resource" {
 }
 
 module "vocabulary_get_favourite" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.favourite_resource.aws_api_gateway_resource
@@ -521,7 +521,7 @@ module "vocabulary_get_favourite" {
 }
 
 module "vocabulary_post_favourite" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.favourite_resource.aws_api_gateway_resource
@@ -532,7 +532,7 @@ module "vocabulary_post_favourite" {
 }
 
 module "vocabulary_any_favourite_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.favourite_proxy_resource.aws_api_gateway_resource
@@ -563,7 +563,7 @@ module "collection_proxy_resource" {
 }
 
 module "vocabulary_get_collection" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.collection_resource.aws_api_gateway_resource
@@ -574,7 +574,7 @@ module "vocabulary_get_collection" {
 }
 
 module "vocabulary_any_collection_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.collection_proxy_resource.aws_api_gateway_resource
@@ -585,7 +585,7 @@ module "vocabulary_any_collection_proxy" {
 }
 
 module "vocabulary_post_collection" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.collection_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/vocabulary/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/vocabulary/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/vocabulary/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/vocabulary/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/webshot/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/main.tf
similarity index 97%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/webshot/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/main.tf
index 195105b9..2265e811 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/webshot/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/main.tf
@@ -82,7 +82,7 @@ module "webshot_proxy_resource" {
 }
 
 module "webshot_get_v1_webshot" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.webshot_resource.aws_api_gateway_resource
@@ -93,7 +93,7 @@ module "webshot_get_v1_webshot" {
 }
 
 module "webshot_any_v1_webshot_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.webshot_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/webshot/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/webshot/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/webshot/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/webshot/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/widget/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/main.tf
similarity index 95%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/widget/main.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/main.tf
index 4b641e9f..05cff476 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/widget/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/main.tf
@@ -106,7 +106,7 @@ module "dataset_id_widget_id_proxy_resource" {
 }
 
 module "widget_get_widget" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.widget_resource.aws_api_gateway_resource
@@ -117,7 +117,7 @@ module "widget_get_widget" {
 }
 
 module "widget_post_widget" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.widget_resource.aws_api_gateway_resource
@@ -128,7 +128,7 @@ module "widget_post_widget" {
 }
 
 module "widget_any_widget_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.widget_proxy_resource.aws_api_gateway_resource
@@ -139,7 +139,7 @@ module "widget_any_widget_proxy" {
 }
 
 module "widget_any_dataset_id_widget" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_widget_resource.aws_api_gateway_resource
@@ -151,7 +151,7 @@ module "widget_any_dataset_id_widget" {
 }
 
 module "widget_any_dataset_id_widget_id" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_widget_id_resource.aws_api_gateway_resource
@@ -163,7 +163,7 @@ module "widget_any_dataset_id_widget_id" {
 }
 
 module "widget_any_dataset_id_widget_id_proxy" {
-  source                      = "../endpoint"
+  source                      = "../../endpoint"
   x_rw_domain                 = var.x_rw_domain
   api_gateway                 = var.api_gateway
   api_resource                = module.dataset_id_widget_id_proxy_resource.aws_api_gateway_resource
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/widget/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/outputs.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/widget/outputs.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/outputs.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/widget/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/variables.tf
similarity index 100%
rename from terraform-k8s-infrastructure/modules/k8s_microservice_routing/widget/variables.tf
rename to terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/variables.tf
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/v1-redirect/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/v1-redirect/main.tf
index 2abdec93..a1333ff3 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/v1-redirect/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/v1-redirect/main.tf
@@ -4,7 +4,7 @@
 
 // //{proxy+}
 module "v1_redirect_proxy_resource" {
-  source      = "../resource"
+  source      = "../microservices/resource"
   rest_api_id = var.api_gateway.id
   parent_id   = var.root_resource_id
   path_part   = "{proxy+}"
diff --git a/terraform-localstack/main.tf b/terraform-localstack/main.tf
index 278b5ec6..15a52db0 100644
--- a/terraform-localstack/main.tf
+++ b/terraform-localstack/main.tf
@@ -120,21 +120,21 @@ resource "aws_api_gateway_deployment" "prod" {
 
 // Base API Gateway resources
 module "v1_resource" {
-  source      = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource"
+  source      = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource"
   rest_api_id = aws_api_gateway_rest_api.rw_api_gateway.id
   parent_id   = aws_api_gateway_rest_api.rw_api_gateway.root_resource_id
   path_part   = "v1"
 }
 
 module "v2_resource" {
-  source      = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource"
+  source      = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource"
   rest_api_id = aws_api_gateway_rest_api.rw_api_gateway.id
   parent_id   = aws_api_gateway_rest_api.rw_api_gateway.root_resource_id
   path_part   = "v2"
 }
 
 module "v3_resource" {
-  source      = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource"
+  source      = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource"
   rest_api_id = aws_api_gateway_rest_api.rw_api_gateway.id
   parent_id   = aws_api_gateway_rest_api.rw_api_gateway.root_resource_id
   path_part   = "v3"
@@ -183,7 +183,7 @@ EOF
 }
 
 module "analysis-gee" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/analysis-gee"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   connection_type = "INTERNET"
@@ -198,7 +198,7 @@ module "analysis-gee" {
 }
 
 module "aqueduct-analysis" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/aqueduct-analysis"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -207,7 +207,7 @@ module "aqueduct-analysis" {
 }
 
 module "arcgis" {
-  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis"
+  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain               = var.x_rw_domain
   connection_type           = "INTERNET"
@@ -223,7 +223,7 @@ module "arcgis" {
 }
 
 module "arcgis-proxy" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/arcgis-proxy"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -232,7 +232,7 @@ module "arcgis-proxy" {
 }
 
 module "area" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/area"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -247,7 +247,7 @@ module "area" {
 }
 
 module "auth" {
-  source      = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorization"
+  source      = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization"
   api_gateway = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain = var.x_rw_domain
 
@@ -258,7 +258,7 @@ module "auth" {
 }
 
 module "bigquery" {
-  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/bigquery"
+  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain               = var.x_rw_domain
   connection_type           = "INTERNET"
@@ -275,7 +275,7 @@ module "bigquery" {
 }
 
 module "biomass" {
-  source                   = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/biomass"
+  source                   = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass"
   api_gateway              = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain              = var.x_rw_domain
   connection_type          = "INTERNET"
@@ -288,7 +288,7 @@ module "biomass" {
 }
 
 module "carto" {
-  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/carto"
+  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain               = var.x_rw_domain
   connection_type           = "INTERNET"
@@ -305,7 +305,7 @@ module "carto" {
 }
 
 module "converter" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/converter"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -314,7 +314,7 @@ module "converter" {
 }
 
 module "dataset" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/dataset"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -324,7 +324,7 @@ module "dataset" {
 }
 
 module "doc-orchestrator" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/doc-orchestrator"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -333,7 +333,7 @@ module "doc-orchestrator" {
 }
 
 module "document-adapter" {
-  source                 = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/document-adapter"
+  source                 = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter"
   api_gateway            = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain            = var.x_rw_domain
   connection_type        = "INTERNET"
@@ -351,7 +351,7 @@ module "document-adapter" {
 }
 
 module "fires-summary-stats" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/fires-summary-stats"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -360,7 +360,7 @@ module "fires-summary-stats" {
 }
 
 module "forest-change" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/forest-change"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -369,7 +369,7 @@ module "forest-change" {
 }
 
 module "gee" {
-  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee"
+  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain               = var.x_rw_domain
   connection_type           = "INTERNET"
@@ -386,7 +386,7 @@ module "gee" {
 }
 
 module "gee-tiles" {
-  source               = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gee-tiles"
+  source               = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles"
   api_gateway          = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain          = var.x_rw_domain
   connection_type      = "INTERNET"
@@ -401,7 +401,7 @@ module "gee-tiles" {
 }
 
 module "geostore" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/geostore"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -411,7 +411,7 @@ module "geostore" {
 }
 
 module "gfw-adapter" {
-  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-adapter"
+  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain               = var.x_rw_domain
   connection_type           = "INTERNET"
@@ -428,7 +428,7 @@ module "gfw-adapter" {
 }
 
 module "gfw-contact" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-contact"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -437,7 +437,7 @@ module "gfw-contact" {
 }
 
 module "gfw-forma" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-forma"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -446,7 +446,7 @@ module "gfw-forma" {
 }
 
 module "gfw-guira" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-guira"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -456,7 +456,7 @@ module "gfw-guira" {
 }
 
 module "gfw-ogr" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -466,7 +466,7 @@ module "gfw-ogr" {
 }
 
 module "gfw-ogr-gfw-pro" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-ogr-gfw-pro"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -475,7 +475,7 @@ module "gfw-ogr-gfw-pro" {
 }
 
 module "gfw-prodes" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-prodes"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -485,7 +485,7 @@ module "gfw-prodes" {
 }
 
 module "gfw-umd" {
-  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-umd"
+  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain               = var.x_rw_domain
   connection_type           = "INTERNET"
@@ -497,7 +497,7 @@ module "gfw-umd" {
 }
 
 module "gfw-user" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gfw-user"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -507,7 +507,7 @@ module "gfw-user" {
 }
 
 module "glad-analysis-tiled" {
-  source                  = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/glad-analysis-tiled"
+  source                  = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled"
   api_gateway             = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain             = var.x_rw_domain
   connection_type         = "INTERNET"
@@ -520,7 +520,7 @@ module "glad-analysis-tiled" {
 }
 
 module "graph-client" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/graph-client"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -529,7 +529,7 @@ module "graph-client" {
 }
 
 module "gs-pro-config" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/gs-pro-config"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -538,7 +538,7 @@ module "gs-pro-config" {
 }
 
 module "high-res" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/high-res"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -547,7 +547,7 @@ module "high-res" {
 }
 
 module "imazon" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/imazon"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -561,7 +561,7 @@ module "imazon" {
 }
 
 module "layer" {
-  source                 = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/layer"
+  source                 = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer"
   api_gateway            = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain            = var.x_rw_domain
   connection_type        = "INTERNET"
@@ -576,7 +576,7 @@ module "layer" {
 }
 
 module "metadata" {
-  source                           = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/metadata"
+  source                           = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata"
   api_gateway                      = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain                      = var.x_rw_domain
   connection_type                  = "INTERNET"
@@ -591,7 +591,7 @@ module "metadata" {
 }
 
 module "nexgddp" {
-  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/nexgddp"
+  source                    = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp"
   api_gateway               = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain               = var.x_rw_domain
   connection_type           = "INTERNET"
@@ -611,7 +611,7 @@ module "nexgddp" {
 }
 
 module "proxy" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/proxy"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -624,7 +624,7 @@ module "proxy" {
 }
 
 module "query" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/query"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -636,7 +636,7 @@ module "query" {
 }
 
 module "quicc" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/quicc"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   connection_type = "INTERNET"
@@ -648,7 +648,7 @@ module "quicc" {
 }
 
 module "rw-lp" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/rw-lp"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   connection_type = "INTERNET"
@@ -656,7 +656,7 @@ module "rw-lp" {
 }
 
 module "resource-watch-manager" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/resource-watch-manager"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -665,7 +665,7 @@ module "resource-watch-manager" {
 }
 
 module "salesforce-connector" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/salesforce-connector"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -674,7 +674,7 @@ module "salesforce-connector" {
 }
 
 module "story" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/story"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -683,7 +683,7 @@ module "story" {
 }
 
 module "subscriptions" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/subscriptions"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -692,7 +692,7 @@ module "subscriptions" {
 }
 
 module "task-executor" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/task-executor"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -701,7 +701,7 @@ module "task-executor" {
 }
 
 module "true-color-tiles" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/true-color-tiles"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   v1_resource     = module.v1_resource.aws_api_gateway_resource
@@ -710,7 +710,7 @@ module "true-color-tiles" {
 }
 
 module "viirs-fires" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/viirs-fires"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   connection_type = "INTERNET"
@@ -720,7 +720,7 @@ module "viirs-fires" {
 }
 
 module "vocabulary" {
-  source                           = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/vocabulary"
+  source                           = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary"
   api_gateway                      = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain                      = var.x_rw_domain
   connection_type                  = "INTERNET"
@@ -735,7 +735,7 @@ module "vocabulary" {
 }
 
 module "webshot" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/webshot"
+  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain     = var.x_rw_domain
   connection_type = "INTERNET"
@@ -744,7 +744,7 @@ module "webshot" {
 }
 
 module "widget" {
-  source                 = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/widget"
+  source                 = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget"
   api_gateway            = aws_api_gateway_rest_api.rw_api_gateway
   x_rw_domain            = var.x_rw_domain
   connection_type        = "INTERNET"
diff --git a/terraform/modules/bootstrap/main.tf b/terraform/modules/bootstrap/main.tf
index e1ba8496..d0e3b744 100644
--- a/terraform/modules/bootstrap/main.tf
+++ b/terraform/modules/bootstrap/main.tf
@@ -12,7 +12,7 @@ resource "aws_s3_bucket" "state_bucket" {
   }
 
   tags = merge({ Resource = "Terraform State" },
-  var.tags)
+    var.tags)
 }
 
 resource "aws_s3_bucket_server_side_encryption_configuration" "state_bucket_encryption" {
@@ -51,6 +51,6 @@ resource "aws_dynamodb_table" "tf_lock_state" {
   tags = merge({
     Name     = var.dynamo_db_table_name
     Resource = "Terraform State"
-    },
-  var.tags)
+  },
+    var.tags)
 }
diff --git a/terraform/modules/eks/main.tf b/terraform/modules/eks/main.tf
index ba84a4c1..eec78c95 100644
--- a/terraform/modules/eks/main.tf
+++ b/terraform/modules/eks/main.tf
@@ -12,7 +12,7 @@ resource "aws_eks_cluster" "eks_cluster" {
   version  = var.eks_version
 
   vpc_config {
-    subnet_ids = var.subnet_ids
+    subnet_ids              = var.subnet_ids
     # At the time of this writing, AWS wasn't accepting EKS on us-east-1e
     security_group_ids      = [aws_security_group.eks_cluster_security_group.id]
     endpoint_private_access = true
@@ -38,12 +38,10 @@ resource "aws_security_group" "eks_cluster_security_group" {
   vpc_id      = var.vpc_id
 
   egress {
-    from_port = 0
-    to_port   = 0
-    protocol  = "-1"
-    cidr_blocks = [
-      "0.0.0.0/0"
-    ]
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
   }
 
   tags = {
@@ -52,9 +50,7 @@ resource "aws_security_group" "eks_cluster_security_group" {
 }
 
 resource "aws_security_group_rule" "eks_cluster_cluster_ingress_workstation_https" {
-  cidr_blocks = [
-    "0.0.0.0/0"
-  ]
+  cidr_blocks       = ["0.0.0.0/0"]
   # TODO: restrict for improved security
   description       = "Allow workstation to communicate with the cluster API Server"
   from_port         = 443
@@ -70,8 +66,8 @@ resource "aws_iam_role" "eks-cluster-admin" {
   assume_role_policy = jsonencode({
     Statement = [
       {
-        Action = "sts:AssumeRole"
-        Effect = "Allow"
+        Action    = "sts:AssumeRole"
+        Effect    = "Allow"
         Principal = {
           Service = "eks.amazonaws.com"
         }
@@ -110,8 +106,8 @@ resource "aws_iam_role" "eks-node-group-iam-role" {
   assume_role_policy = jsonencode({
     Statement = [
       {
-        Action = "sts:AssumeRole"
-        Effect = "Allow"
+        Action    = "sts:AssumeRole"
+        Effect    = "Allow"
         Principal = {
           Service = "ec2.amazonaws.com"
         }

From 41392bfdc81d4b2a8b205e65ce4456e82a68138c Mon Sep 17 00:00:00 2001
From: Tiago Garcia <tiagojsag@gmail.com>
Date: Wed, 16 Nov 2022 08:02:41 +0100
Subject: [PATCH 2/5] API keys - WIP

---
 .../modules/k8s_microservice_routing/main.tf  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf
index 0af2e368..69a05bc4 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf
@@ -73,7 +73,7 @@ EOF
 
 resource "aws_api_gateway_method_settings" "rw_api_gateway_general_settings" {
   rest_api_id = aws_api_gateway_rest_api.rw_api_gateway.id
-  stage_name  = aws_api_gateway_deployment.prod.stage_name
+  stage_name  = aws_api_gateway_stage.prod.stage_name
   method_path = "*/*"
 
   settings {
@@ -204,9 +204,23 @@ resource "aws_api_gateway_vpc_link" "rw_api_gfw_lb_vpc_link" {
   }
 }
 
+resource "aws_cloudwatch_log_group" "api_gateway_custom_logs" {
+  name = "api_gateway_custom_logs"
+}
+
+resource "aws_api_gateway_stage" "prod" {
+  deployment_id = aws_api_gateway_deployment.prod.id
+  rest_api_id   = aws_api_gateway_rest_api.rw_api_gateway.id
+  stage_name    = "prod"
+
+  access_log_settings {
+    destination_arn = aws_cloudwatch_log_group.api_gateway_custom_logs.arn
+    format = "($context.requestId), APIKey: $context.identity.apiKey, HTTP Method: $context.httpMethod, Path: $context.resourcePath, Status: $context.status, Errors: $context.error.messageString, Description: custom_log"
+  }
+}
+
 resource "aws_api_gateway_deployment" "prod" {
   rest_api_id = aws_api_gateway_rest_api.rw_api_gateway.id
-  stage_name  = "prod"
 
   triggers = {
     redeployment = sha1(join(",", tolist([
@@ -1484,7 +1498,7 @@ resource "aws_api_gateway_domain_name" "aws_env_resourcewatch_org_gateway_domain
 
 resource "aws_api_gateway_base_path_mapping" "aws_env_resourcewatch_org_base_path_mapping" {
   api_id      = aws_api_gateway_rest_api.rw_api_gateway.id
-  stage_name  = aws_api_gateway_deployment.prod.stage_name
+  stage_name  = aws_api_gateway_stage.prod.stage_name
   domain_name = aws_api_gateway_domain_name.aws_env_resourcewatch_org_gateway_domain_name.domain_name
 }
 
@@ -1534,6 +1548,6 @@ resource "aws_api_gateway_domain_name" "env_api_resourcewatch_org_gateway_domain
 
 resource "aws_api_gateway_base_path_mapping" "env_api_resourcewatch_org_base_path_mapping" {
   api_id      = aws_api_gateway_rest_api.rw_api_gateway.id
-  stage_name  = aws_api_gateway_deployment.prod.stage_name
+  stage_name  = aws_api_gateway_stage.prod.stage_name
   domain_name = aws_api_gateway_domain_name.env_api_resourcewatch_org_gateway_domain_name.domain_name
 }

From 5fec3419f95fbdd4c216cb3ab7971cd0b0e88c7c Mon Sep 17 00:00:00 2001
From: Tiago Garcia <tiagojsag@gmail.com>
Date: Wed, 19 Jul 2023 11:26:19 +0100
Subject: [PATCH 3/5] Add require_api_key flag to all routes; add cloudwatch
 dashboard POC

---
 .gitignore                                    |   1 -
 .../.terraform.lock.hcl                       |  19 +++
 terraform-k8s-infrastructure/main.tf          |   1 +
 .../modules/k8s_data_layer/elasticsearch.tf   |   2 +-
 .../modules/k8s_data_layer/versions.tf        |   5 -
 .../modules/k8s_infrastructure/main.tf        |   4 +-
 .../modules/k8s_infrastructure/versions.tf    |   5 -
 .../k8s_microservice_routing/authorizer.tf    | 127 ------------------
 .../k8s_microservice_routing/endpoint/main.tf |  15 +--
 .../endpoint/variable.tf                      |  18 ---
 .../api_key_authorizer_lambda.py              |  21 ---
 .../modules/k8s_microservice_routing/main.tf  |  74 +++++++++-
 .../microservices/analysis-gee/main.tf        |  43 ++++++
 .../microservices/analysis-gee/variables.tf   |   7 +-
 .../microservices/aqueduct-analysis/main.tf   |   1 +
 .../aqueduct-analysis/variables.tf            |   7 +-
 .../microservices/arcgis-proxy/main.tf        |   1 +
 .../microservices/arcgis-proxy/variables.tf   |   7 +-
 .../microservices/arcgis/main.tf              |   7 +
 .../microservices/arcgis/variables.tf         |   7 +-
 .../microservices/area/main.tf                |   8 ++
 .../microservices/area/variables.tf           |   7 +-
 .../microservices/authorization/main.tf       |  26 +++-
 .../microservices/authorization/variables.tf  |   7 +-
 .../microservices/bigquery/main.tf            |   6 +
 .../microservices/bigquery/variables.tf       |   7 +-
 .../microservices/biomass/main.tf             |   1 +
 .../microservices/biomass/variables.tf        |   7 +-
 .../microservices/carto/main.tf               |   7 +
 .../microservices/carto/variables.tf          |   7 +-
 .../microservices/converter/main.tf           |   1 +
 .../microservices/converter/variables.tf      |   7 +-
 .../microservices/dataset/main.tf             |  19 +--
 .../microservices/dataset/variables.tf        |  28 +---
 .../microservices/doc-orchestrator/main.tf    |   1 +
 .../doc-orchestrator/variables.tf             |   7 +-
 .../microservices/document-adapter/main.tf    |  21 +++
 .../document-adapter/variables.tf             |   7 +-
 .../microservices/fires-summary-stats/main.tf |   2 +
 .../fires-summary-stats/variables.tf          |   7 +-
 .../microservices/forest-change/main.tf       |   3 +
 .../microservices/forest-change/variables.tf  |   7 +-
 .../forest-watcher-api/variables.tf           |   7 +-
 .../microservices/forms/variables.tf          |   7 +-
 .../microservices/fw-alerts/variables.tf      |   7 +-
 .../fw-contextual-layers/variables.tf         |   7 +-
 .../microservices/fw-teams/variables.tf       |   7 +-
 .../microservices/gee-tiles/main.tf           |   1 +
 .../microservices/gee-tiles/variables.tf      |   7 +-
 .../microservices/gee/main.tf                 |   7 +
 .../microservices/gee/variables.tf            |   7 +-
 .../microservices/geostore/main.tf            |   6 +
 .../microservices/geostore/variables.tf       |   7 +-
 .../microservices/gfw-adapter/main.tf         |   7 +
 .../microservices/gfw-adapter/variables.tf    |   7 +-
 .../microservices/gfw-contact/main.tf         |   1 +
 .../microservices/gfw-contact/variables.tf    |   7 +-
 .../microservices/gfw-forma/main.tf           |   3 +
 .../microservices/gfw-forma/variables.tf      |   7 +-
 .../microservices/gfw-guira/main.tf           |   6 +
 .../microservices/gfw-guira/variables.tf      |   7 +-
 .../microservices/gfw-ogr-gfw-pro/main.tf     |   1 +
 .../gfw-ogr-gfw-pro/variables.tf              |   7 +-
 .../microservices/gfw-ogr/main.tf             |   2 +
 .../microservices/gfw-ogr/variables.tf        |   7 +-
 .../microservices/gfw-prodes/main.tf          |   6 +
 .../microservices/gfw-prodes/variables.tf     |   7 +-
 .../microservices/gfw-umd/main.tf             |   3 +
 .../microservices/gfw-umd/variables.tf        |   7 +-
 .../microservices/gfw-user/main.tf            |   6 +
 .../microservices/gfw-user/variables.tf       |   7 +-
 .../microservices/glad-analysis-tiled/main.tf |   8 ++
 .../glad-analysis-tiled/variables.tf          |   7 +-
 .../microservices/graph-client/main.tf        |   1 +
 .../microservices/graph-client/variables.tf   |   7 +-
 .../microservices/gs-pro-config/main.tf       |   1 +
 .../microservices/gs-pro-config/variables.tf  |   7 +-
 .../microservices/high-res/main.tf            |   1 +
 .../microservices/high-res/variables.tf       |   7 +-
 .../microservices/imazon/main.tf              |   6 +
 .../microservices/imazon/variables.tf         |   7 +-
 .../microservices/layer/main.tf               |   6 +-
 .../microservices/layer/variables.tf          |   7 +-
 .../microservices/metadata/main.tf            |   2 +
 .../microservices/metadata/variables.tf       |   7 +-
 .../microservices/nexgddp/main.tf             |  11 ++
 .../microservices/nexgddp/variables.tf        |   7 +-
 .../microservices/proxy/main.tf               |   1 +
 .../microservices/proxy/variables.tf          |   7 +-
 .../microservices/query/main.tf               |  11 ++
 .../microservices/query/variables.tf          |   7 +-
 .../microservices/quicc/main.tf               |   2 +
 .../microservices/quicc/variables.tf          |   7 +-
 .../resource-watch-manager/main.tf            |  34 +++++
 .../resource-watch-manager/variables.tf       |   7 +-
 .../microservices/rw-lp/main.tf               |   2 +
 .../microservices/rw-lp/variables.tf          |   7 +-
 .../salesforce-connector/main.tf              |   1 +
 .../salesforce-connector/variables.tf         |   7 +-
 .../microservices/story/main.tf               |   3 +
 .../microservices/story/variables.tf          |   7 +-
 .../microservices/subscriptions/main.tf       |   3 +
 .../microservices/subscriptions/variables.tf  |   7 +-
 .../microservices/task-executor/main.tf       |   2 +
 .../microservices/task-executor/variables.tf  |   7 +-
 .../microservices/true-color-tiles/main.tf    |   1 +
 .../true-color-tiles/variables.tf             |   7 +-
 .../microservices/viirs-fires/main.tf         |   6 +
 .../microservices/viirs-fires/variables.tf    |   7 +-
 .../microservices/vocabulary/main.tf          |  10 ++
 .../microservices/vocabulary/variables.tf     |   7 +-
 .../microservices/webshot/main.tf             |   2 +
 .../microservices/webshot/variables.tf        |   7 +-
 .../microservices/widget/main.tf              |   3 +
 .../microservices/widget/variables.tf         |   7 +-
 .../k8s_microservice_routing/outputs.tf       |   6 +-
 .../k8s_microservice_routing/variables.tf     |   7 +-
 terraform-k8s-infrastructure/outputs.tf       |   6 +-
 terraform-k8s-infrastructure/variables.tf     |   4 +
 .../vars/terraform-dev.tfvars                 |   3 +-
 .../vars/terraform-production.tfvars          |   1 +
 .../vars/terraform-staging.tfvars             |   3 +-
 terraform/main.tf                             |   4 +
 terraform/modules/cloudwatch-charts/main.tf   |  64 +++++++++
 124 files changed, 802 insertions(+), 300 deletions(-)
 delete mode 100644 terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorizer.tf
 delete mode 100644 terraform-k8s-infrastructure/modules/k8s_microservice_routing/lambda_source/api_key_authorizer_lambda.py
 create mode 100644 terraform/modules/cloudwatch-charts/main.tf

diff --git a/.gitignore b/.gitignore
index e6c97827..714e1af8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,3 @@ terraform-k8s-infrastructure/vars/private.tfvars
 
 terraform.tfstate
 terraform.tfstate.backup
-/terraform-k8s-infrastructure/modules/k8s_microservice_routing/lambda.zip
diff --git a/terraform-k8s-infrastructure/.terraform.lock.hcl b/terraform-k8s-infrastructure/.terraform.lock.hcl
index 94a540ad..785e9bf0 100644
--- a/terraform-k8s-infrastructure/.terraform.lock.hcl
+++ b/terraform-k8s-infrastructure/.terraform.lock.hcl
@@ -40,6 +40,25 @@ provider "registry.terraform.io/gavinbunney/kubectl" {
   ]
 }
 
+provider "registry.terraform.io/hashicorp/archive" {
+  version = "2.4.0"
+  hashes = [
+    "h1:EtN1lnoHoov3rASpgGmh6zZ/W6aRCTgKC7iMwvFY1yc=",
+    "zh:18e408596dd53048f7fc8229098d0e3ad940b92036a24287eff63e2caec72594",
+    "zh:392d4216ecd1a1fd933d23f4486b642a8480f934c13e2cae3c13b6b6a7e34a7b",
+    "zh:655dd1fa5ca753a4ace21d0de3792d96fff429445717f2ce31c125d19c38f3ff",
+    "zh:70dae36c176aa2b258331ad366a471176417a94dd3b4985a911b8be9ff842b00",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:7d8c8e3925f1e21daf73f85983894fbe8868e326910e6df3720265bc657b9c9c",
+    "zh:a032ec0f0aee27a789726e348e8ad20778c3a1c9190ef25e7cff602c8d175f44",
+    "zh:b8e50de62ba185745b0fe9713755079ad0e9f7ac8638d204de6762cc36870410",
+    "zh:c8ad0c7697a3d444df21ff97f3473a8604c8639be64afe3f31b8ec7ad7571e18",
+    "zh:df736c5a2a7c3a82c5493665f659437a22f0baf8c2d157e45f4dd7ca40e739fc",
+    "zh:e8ffbf578a0977074f6d08aa8734e36c726e53dc79894cfc4f25fadc4f45f1df",
+    "zh:efea57ff23b141551f92b2699024d356c7ffd1a4ad62931da7ed7a386aef7f1f",
+  ]
+}
+
 provider "registry.terraform.io/hashicorp/aws" {
   version     = "4.48.0"
   constraints = "~> 4.48.0"
diff --git a/terraform-k8s-infrastructure/main.tf b/terraform-k8s-infrastructure/main.tf
index 80f655d1..1c85f00b 100644
--- a/terraform-k8s-infrastructure/main.tf
+++ b/terraform-k8s-infrastructure/main.tf
@@ -51,6 +51,7 @@ module "k8s_microservice_routing" {
   tf_core_state_bucket = var.tf_core_state_bucket
   x_rw_domain          = var.x_rw_domain
   fw_backend_url       = var.fw_backend_url
+  require_api_key      = var.require_api_key
 }
 
 module "k8s_namespaces" {
diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/elasticsearch.tf b/terraform-k8s-infrastructure/modules/k8s_data_layer/elasticsearch.tf
index 1ecc2c9c..b6292127 100644
--- a/terraform-k8s-infrastructure/modules/k8s_data_layer/elasticsearch.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_data_layer/elasticsearch.tf
@@ -167,7 +167,7 @@ resource "aws_elasticsearch_domain" "rw-api-elasticsearch" {
     ]
 
     security_group_ids = [
-      aws_security_group.elasticsearch-sg.id]
+    aws_security_group.elasticsearch-sg.id]
   }
 
   advanced_options = {
diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/versions.tf b/terraform-k8s-infrastructure/modules/k8s_data_layer/versions.tf
index 4a65e396..b3032651 100644
--- a/terraform-k8s-infrastructure/modules/k8s_data_layer/versions.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_data_layer/versions.tf
@@ -45,13 +45,8 @@ provider "helm" {
     host                   = var.cluster_endpoint
     cluster_ca_certificate = base64decode(var.cluster_ca)
     exec {
-<<<<<<< HEAD
       api_version = "client.authentication.k8s.io/v1beta1"
       args = [
-=======
-      api_version = "client.authentication.k8s.io/v1alpha1"
-      args        = [
->>>>>>> 072f17c (WIP - API Gateway API keys)
         "eks",
         "get-token",
         "--cluster-name",
diff --git a/terraform-k8s-infrastructure/modules/k8s_infrastructure/main.tf b/terraform-k8s-infrastructure/modules/k8s_infrastructure/main.tf
index d8e46335..55fcd735 100644
--- a/terraform-k8s-infrastructure/modules/k8s_infrastructure/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_infrastructure/main.tf
@@ -22,7 +22,7 @@ module "alb" {
 // File has changes - see link above for details
 data "kubectl_path_documents" "cluster_autoscaler_manifests" {
   pattern = "${path.module}/cluster_autoscaler/cluster-autoscaler-autodiscover.yaml.tmpl"
-  vars    = {
+  vars = {
     cluster_name : var.cluster_name
   }
 }
@@ -49,7 +49,7 @@ resource "kubectl_manifest" "metrics_server" {
 // File has changes - see link above for details
 data "kubectl_path_documents" "container_insights_manifests" {
   pattern = "${path.module}/container_insights/container_insights.yaml.tmpl"
-  vars    = {
+  vars = {
     aws_region : var.aws_region,
     cluster_name : var.cluster_name
   }
diff --git a/terraform-k8s-infrastructure/modules/k8s_infrastructure/versions.tf b/terraform-k8s-infrastructure/modules/k8s_infrastructure/versions.tf
index b60bcd18..d928a930 100644
--- a/terraform-k8s-infrastructure/modules/k8s_infrastructure/versions.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_infrastructure/versions.tf
@@ -27,13 +27,8 @@ provider "helm" {
     host                   = var.cluster_endpoint
     cluster_ca_certificate = base64decode(var.cluster_ca)
     exec {
-<<<<<<< HEAD
       api_version = "client.authentication.k8s.io/v1beta1"
       args = [
-=======
-      api_version = "client.authentication.k8s.io/v1alpha1"
-      args        = [
->>>>>>> 072f17c (WIP - API Gateway API keys)
         "eks",
         "get-token",
         "--cluster-name",
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorizer.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorizer.tf
deleted file mode 100644
index b522e89b..00000000
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/authorizer.tf
+++ /dev/null
@@ -1,127 +0,0 @@
-# Lambda Authorizer
-resource "aws_api_gateway_authorizer" "api_key" {
-  name                             = "api_key"
-  rest_api_id                      = aws_api_gateway_rest_api.rw_api_gateway.id
-  type                             = "REQUEST"
-  authorizer_uri                   = aws_lambda_function.authorizer.invoke_arn
-  authorizer_credentials           = aws_iam_role.invocation_role.arn
-  authorizer_result_ttl_in_seconds = 0
-
-  # making sure terraform doesn't require default authorization
-  # header (https://github.com/hashicorp/terraform-provider-aws/issues/5845)
-  identity_source = ","
-}
-
-#resource "aws_lambda_function" "authorizer" {
-#  filename      = "api_gateway/api_key_authorizer_lambda.zip"
-#  function_name = "api_gateway_authorizer_${var.environment}"
-#  runtime       = "python3.8"
-#  role          = aws_iam_role.lambda.arn
-#  handler       = "lambda_function.handler"
-#
-#  source_code_hash = filebase64sha256("api_gateway/api_key_authorizer_lambda.zip")
-#}
-
-data "archive_file" "lambda_zip" {
-  type        = "zip"
-  source_dir  = "${path.module}/lambda_source"
-  output_path = "${path.module}/lambda.zip"
-}
-
-resource "aws_lambda_function" "authorizer" {
-  filename         = "${path.module}/lambda.zip"
-  source_code_hash = data.archive_file.lambda_zip.output_base64sha256
-  function_name    = "api_gateway_authorizer_${var.environment}"
-  role             = aws_iam_role.lambda.arn
-  handler          = "api_key_authorizer_lambda.handler"
-  runtime          = "python3.8"
-}
-
-resource "aws_iam_role" "invocation_role" {
-  name = "api_gateway_auth_invocation_${var.environment}"
-  path = "/"
-
-  assume_role_policy = jsonencode({
-    Statement = [
-      {
-        Action    = "sts:AssumeRole"
-        Effect    = "Allow"
-        Principal = {
-          Service = "apigateway.amazonaws.com"
-        }
-      }
-    ]
-    Version = "2012-10-17"
-  })
-}
-
-resource "aws_iam_role_policy" "invocation_policy" {
-  name = "default"
-  role = aws_iam_role.invocation_role.id
-
-  policy = jsonencode(
-    {
-      "Version" : "2012-10-17",
-      "Statement" : [
-        {
-          "Action" : "lambda:InvokeFunction",
-          "Effect" : "Allow",
-          "Resource" : aws_lambda_function.authorizer.arn
-        }
-      ]
-    }
-  )
-}
-
-resource "aws_iam_role" "lambda" {
-  name = "api_gw_authorizer_lambda_${var.environment}"
-
-  assume_role_policy = jsonencode({
-    Statement = [
-      {
-        Action    = "sts:AssumeRole"
-        Effect    = "Allow"
-        Principal = {
-          Service = "lambda.amazonaws.com"
-        }
-      }
-    ]
-    Version = "2012-10-17"
-  })
-}
-
-# Lambda logging
-resource "aws_cloudwatch_log_group" "example" {
-  name              = "/aws/lambda/api_gw_authorizer_lambda_${var.environment}"
-  retention_in_days = 14
-}
-
-# See also the following AWS managed policy: AWSLambdaBasicExecutionRole
-resource "aws_iam_policy" "lambda_logging" {
-  name        = "lambda_logging"
-  path        = "/"
-  description = "IAM policy for logging from a lambda"
-
-  policy = <<EOF
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Action": [
-        "logs:CreateLogGroup",
-        "logs:CreateLogStream",
-        "logs:PutLogEvents"
-      ],
-      "Resource": "arn:aws:logs:*:*:*",
-      "Effect": "Allow"
-    }
-  ]
-}
-EOF
-}
-
-resource "aws_iam_role_policy_attachment" "lambda_logs" {
-  role       = aws_iam_role.lambda.name
-  policy_arn = aws_iam_policy.lambda_logging.arn
-}
-
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/main.tf
index a09eb0e5..1075a9f9 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/main.tf
@@ -1,17 +1,16 @@
 resource "aws_api_gateway_method" "endpoint_method" {
-  rest_api_id        = var.api_gateway.id
-  resource_id        = var.api_resource.id
-  http_method        = var.method
+  rest_api_id   = var.api_gateway.id
+  resource_id   = var.api_resource.id
+  http_method   = var.method
+  authorization = "NONE"
   request_parameters = merge(
     (length(regexall("\\{(.*)\\}", var.api_resource.path_part)) > 0 ? {
       "method.request.path.${replace(var.api_resource.path_part, "/\\{|\\}|\\+/", "")}" = true
     } : {}),
-    {for s in var.endpoint_request_parameters : "method.request.path.${s}" => true},
+    { for s in var.endpoint_request_parameters : "method.request.path.${s}" => true },
     { "method.request.header.Accept" : false }
   )
-  authorization    = var.authorization
   api_key_required = var.require_api_key
-  authorizer_id    = var.authorizer_id
 }
 
 resource "aws_api_gateway_integration" "endpoint_integration" {
@@ -34,6 +33,6 @@ resource "aws_api_gateway_integration" "endpoint_integration" {
     (length(regexall("\\{(.*)\\}", var.api_resource.path_part)) > 0 ? {
       "integration.request.path.${replace(var.api_resource.path_part, "/\\{|\\}|\\+/", "")}" = "method.request.path.${replace(var.api_resource.path_part, "/\\{|\\}|\\+/", "")}"
     } : {}),
-    {for s in var.endpoint_request_parameters : "integration.request.path.${s}" => "method.request.path.${s}"}
+    { for s in var.endpoint_request_parameters : "integration.request.path.${s}" => "method.request.path.${s}" }
   )
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/variable.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/variable.tf
index 19961439..2f5da964 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/variable.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/endpoint/variable.tf
@@ -47,25 +47,7 @@ variable "connection_type" {
   description = "API Gateway integration type"
 }
 
-variable "authorizer_id" {
-  type    = string
-  default = null
-}
-
 variable "require_api_key" {
   type    = bool
   default = false
 }
-
-variable "authorization" {
-  default = "NONE"
-  validation {
-    condition = contains([
-      "NONE",
-      "CUSTOM",
-      "AWS_IAM",
-      "COGNITO_USER_POOLS"
-    ], var.authorization)
-    error_message = "Unknown authorization method."
-  }
-}
\ No newline at end of file
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/lambda_source/api_key_authorizer_lambda.py b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/lambda_source/api_key_authorizer_lambda.py
deleted file mode 100644
index 00743963..00000000
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/lambda_source/api_key_authorizer_lambda.py
+++ /dev/null
@@ -1,21 +0,0 @@
-def handler(event, context):
-    api_key = event["headers"].get("x-api-key", None) or event[
-        "queryStringParameters"
-    ].get("x-api-key", "")
-    policy = {
-        "principalId": "x-api-key",
-        "policyDocument": {
-            "Version": "2012-10-17",
-            "Statement": [
-                {
-                    "Action": "execute-api:Invoke",
-                    "Effect": "Allow",
-                    "Resource": event["methodArn"],
-                }
-            ],
-        },
-        "usageIdentifierKey": api_key.strip(),
-    }
-    print(policy)
-
-    return policy
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf
index 69a05bc4..c018d1b1 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf
@@ -1,7 +1,7 @@
 # import core state
 data "terraform_remote_state" "core" {
   backend = "s3"
-  config  = {
+  config = {
     bucket = var.tf_core_state_bucket
     region = var.aws_region
     key    = "core.tfstate"
@@ -96,6 +96,7 @@ resource "aws_api_gateway_rest_api" "rw_api_gateway" {
     types = ["REGIONAL"]
   }
   binary_media_types = ["multipart/form-data"]
+  api_key_source     = "HEADER"
 }
 
 data "aws_subnets" "private_subnets" {
@@ -215,7 +216,17 @@ resource "aws_api_gateway_stage" "prod" {
 
   access_log_settings {
     destination_arn = aws_cloudwatch_log_group.api_gateway_custom_logs.arn
-    format = "($context.requestId), APIKey: $context.identity.apiKey, HTTP Method: $context.httpMethod, Path: $context.resourcePath, Status: $context.status, Errors: $context.error.messageString, Description: custom_log"
+    format          = "($context.requestId), APIKey: $context.identity.apiKey, HTTP Method: $context.httpMethod, Path: $context.resourcePath, Status: $context.status, Errors: $context.error.messageString, Description: custom_log"
+  }
+}
+
+resource "aws_api_gateway_usage_plan" "open" {
+  name        = "open"
+  description = "No limits or caps on any endpoints"
+
+  api_stages {
+    api_id = aws_api_gateway_rest_api.rw_api_gateway.id
+    stage  = aws_api_gateway_stage.prod.stage_name
   }
 }
 
@@ -384,6 +395,7 @@ module "analysis-gee" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   v2_resource      = module.v2_resource.aws_api_gateway_resource
 
   eks_asg_names = [
@@ -407,6 +419,7 @@ module "aqueduct-analysis" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_gfw_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.gfw_autoscaling_group.names.0
@@ -423,6 +436,7 @@ module "arcgis" {
   vpc                       = var.vpc
   vpc_link                  = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type           = "VPC_LINK"
+  require_api_key           = var.require_api_key
   v1_resource               = module.v1_resource.aws_api_gateway_resource
   v1_query_resource         = module.query.v1_query_resource
   v1_download_resource      = module.query.v1_download_resource
@@ -449,6 +463,7 @@ module "arcgis-proxy" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0,
@@ -466,6 +481,7 @@ module "area" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   v2_resource      = module.v2_resource.aws_api_gateway_resource
 
   eks_asg_names = [
@@ -489,6 +505,7 @@ module "auth" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_core_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   root_resource_id = aws_api_gateway_rest_api.rw_api_gateway.root_resource_id
 
   eks_asg_names = [
@@ -506,6 +523,7 @@ module "bigquery" {
   vpc                       = var.vpc
   vpc_link                  = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type           = "VPC_LINK"
+  require_api_key           = var.require_api_key
   v1_resource               = module.v1_resource.aws_api_gateway_resource
   v1_query_resource         = module.query.v1_query_resource
   v1_download_resource      = module.query.v1_download_resource
@@ -532,6 +550,7 @@ module "biomass" {
   vpc                      = var.vpc
   vpc_link                 = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type          = "VPC_LINK"
+  require_api_key          = var.require_api_key
   v1_resource              = module.v1_resource.aws_api_gateway_resource
   v1_biomass_loss_resource = module.analysis-gee.v1_biomass_loss_resource
 
@@ -554,6 +573,7 @@ module "carto" {
   vpc                       = var.vpc
   vpc_link                  = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type           = "VPC_LINK"
+  require_api_key           = var.require_api_key
   v1_resource               = module.v1_resource.aws_api_gateway_resource
   v1_query_resource         = module.query.v1_query_resource
   v1_download_resource      = module.query.v1_download_resource
@@ -581,7 +601,8 @@ module "converter" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
-  eks_asg_names    = [
+  require_api_key  = var.require_api_key
+  eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0
   ]
 }
@@ -597,9 +618,7 @@ module "dataset" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
-  require_api_key  = true
-#  authorizer_id    = aws_api_gateway_authorizer.api_key.id
-#  authorization    = "CUSTOM"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0
@@ -617,6 +636,7 @@ module "doc-orchestrator" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0
@@ -633,6 +653,7 @@ module "document-adapter" {
   vpc                    = var.vpc
   vpc_link               = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type        = "VPC_LINK"
+  require_api_key        = var.require_api_key
   v1_resource            = module.v1_resource.aws_api_gateway_resource
   v1_dataset_id_resource = module.dataset.v1_dataset_id_resource
   v1_query_resource      = module.query.v1_query_resource
@@ -660,6 +681,7 @@ module "fires-summary-stats" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0
@@ -677,6 +699,7 @@ module "forest-watcher-api" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   backend_url      = var.fw_backend_url
 
   eks_asg_names = [
@@ -695,6 +718,7 @@ module "forest-change" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.gfw_autoscaling_group.names.0
@@ -712,6 +736,7 @@ module "forms" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_gfw_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   backend_url      = var.fw_backend_url
 
   eks_asg_names = [
@@ -730,6 +755,7 @@ module "fw-alerts" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_gfw_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   backend_url      = var.fw_backend_url
 
   eks_asg_names = [
@@ -748,6 +774,7 @@ module "fw-contextual-layers" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_gfw_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   backend_url      = var.fw_backend_url
 
   eks_asg_names = [
@@ -766,6 +793,7 @@ module "fw-teams" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_gfw_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   backend_url      = var.fw_backend_url
 
   eks_asg_names = [
@@ -783,6 +811,7 @@ module "gee" {
   vpc                       = var.vpc
   vpc_link                  = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type           = "VPC_LINK"
+  require_api_key           = var.require_api_key
   v1_resource               = module.v1_resource.aws_api_gateway_resource
   v1_query_resource         = module.query.v1_query_resource
   v1_download_resource      = module.query.v1_download_resource
@@ -808,6 +837,7 @@ module "gee-tiles" {
   vpc                  = var.vpc
   vpc_link             = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type      = "VPC_LINK"
+  require_api_key      = var.require_api_key
   v1_resource          = module.v1_resource.aws_api_gateway_resource
   v1_layer_resource    = module.layer.v1_layer_resource
   v1_layer_id_resource = module.layer.v1_layer_id_resource
@@ -832,6 +862,7 @@ module "geostore" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   v2_resource      = module.v2_resource.aws_api_gateway_resource
 
   eks_asg_names = [
@@ -849,6 +880,7 @@ module "gfw-adapter" {
   vpc                       = var.vpc
   vpc_link                  = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type           = "VPC_LINK"
+  require_api_key           = var.require_api_key
   v1_resource               = module.v1_resource.aws_api_gateway_resource
   v1_query_resource         = module.query.v1_query_resource
   v1_download_resource      = module.query.v1_download_resource
@@ -876,6 +908,7 @@ module "gfw-contact" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_gfw_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.gfw_autoscaling_group.names.0
@@ -893,6 +926,7 @@ module "gfw-forma" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0
@@ -910,6 +944,7 @@ module "gfw-guira" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   v2_resource      = module.v2_resource.aws_api_gateway_resource
 
   eks_asg_names = [
@@ -928,6 +963,7 @@ module "gfw-ogr" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   v2_resource      = module.v2_resource.aws_api_gateway_resource
 
   eks_asg_names = [
@@ -946,6 +982,7 @@ module "gfw-ogr-gfw-pro" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.gfw_autoscaling_group.names.0
@@ -963,6 +1000,7 @@ module "gfw-prodes" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   v2_resource      = module.v2_resource.aws_api_gateway_resource
 
   eks_asg_names = [
@@ -980,6 +1018,7 @@ module "gfw-umd" {
   vpc                       = var.vpc
   vpc_link                  = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type           = "VPC_LINK"
+  require_api_key           = var.require_api_key
   v1_resource               = module.v1_resource.aws_api_gateway_resource
   v2_resource               = module.v2_resource.aws_api_gateway_resource
   v3_resource               = module.v3_resource.aws_api_gateway_resource
@@ -1002,6 +1041,7 @@ module "gfw-user" {
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   v2_resource      = module.v2_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.gfw_autoscaling_group.names.0,
@@ -1018,6 +1058,7 @@ module "glad-analysis-tiled" {
   vpc                     = var.vpc
   vpc_link                = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type         = "VPC_LINK"
+  require_api_key         = var.require_api_key
   v1_resource             = module.v1_resource.aws_api_gateway_resource
   v1_glad_alerts_resource = module.fires-summary-stats.v1_glad_alerts_resource
 
@@ -1041,6 +1082,7 @@ module "graph-client" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0,
@@ -1058,6 +1100,7 @@ module "gs-pro-config" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0,
@@ -1075,6 +1118,7 @@ module "high-res" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.gfw_autoscaling_group.names.0
@@ -1092,6 +1136,7 @@ module "imazon" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   v2_resource      = module.v2_resource.aws_api_gateway_resource
 
   eks_asg_names = [
@@ -1114,6 +1159,7 @@ module "layer" {
   vpc                    = var.vpc
   vpc_link               = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type        = "VPC_LINK"
+  require_api_key        = var.require_api_key
   v1_resource            = module.v1_resource.aws_api_gateway_resource
   v1_dataset_id_resource = module.dataset.v1_dataset_id_resource
 
@@ -1137,6 +1183,7 @@ module "metadata" {
   vpc                              = var.vpc
   vpc_link                         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type                  = "VPC_LINK"
+  require_api_key                  = var.require_api_key
   v1_resource                      = module.v1_resource.aws_api_gateway_resource
   v1_dataset_resource              = module.dataset.v1_dataset_resource
   v1_dataset_id_resource           = module.dataset.v1_dataset_id_resource
@@ -1160,6 +1207,7 @@ module "nexgddp" {
   vpc                       = var.vpc
   vpc_link                  = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type           = "VPC_LINK"
+  require_api_key           = var.require_api_key
   v1_resource               = module.v1_resource.aws_api_gateway_resource
   v1_query_resource         = module.query.v1_query_resource
   v1_download_resource      = module.query.v1_download_resource
@@ -1190,6 +1238,7 @@ module "proxy" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0
@@ -1211,6 +1260,7 @@ module "query" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0,
@@ -1231,6 +1281,7 @@ module "quicc" {
   vpc              = var.vpc
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   v1_resource      = module.v1_resource.aws_api_gateway_resource
 
   eks_asg_names = [
@@ -1252,6 +1303,7 @@ module "rw-lp" {
   vpc              = var.vpc
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0
@@ -1269,6 +1321,7 @@ module "resource-watch-manager" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0
@@ -1286,6 +1339,7 @@ module "salesforce-connector" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.gfw_autoscaling_group.names.0,
@@ -1303,6 +1357,7 @@ module "story" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0,
@@ -1320,6 +1375,7 @@ module "subscriptions" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0,
@@ -1337,6 +1393,7 @@ module "task-executor" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.apps_autoscaling_group.names.0
@@ -1354,6 +1411,7 @@ module "true-color-tiles" {
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
 
   eks_asg_names = [
     data.aws_autoscaling_groups.gfw_autoscaling_group.names.0
@@ -1370,6 +1428,7 @@ module "viirs-fires" {
   vpc              = var.vpc
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   v1_resource      = module.v1_resource.aws_api_gateway_resource
   v2_resource      = module.v2_resource.aws_api_gateway_resource
 
@@ -1388,6 +1447,7 @@ module "vocabulary" {
   vpc                              = var.vpc
   vpc_link                         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type                  = "VPC_LINK"
+  require_api_key                  = var.require_api_key
   v1_resource                      = module.v1_resource.aws_api_gateway_resource
   v1_dataset_resource              = module.dataset.v1_dataset_resource
   v1_dataset_id_resource           = module.dataset.v1_dataset_id_resource
@@ -1411,6 +1471,7 @@ module "webshot" {
   vpc              = var.vpc
   vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type  = "VPC_LINK"
+  require_api_key  = var.require_api_key
   v1_resource      = module.v1_resource.aws_api_gateway_resource
 
   eks_asg_names = [
@@ -1428,6 +1489,7 @@ module "widget" {
   vpc                    = var.vpc
   vpc_link               = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
   connection_type        = "VPC_LINK"
+  require_api_key        = var.require_api_key
   v1_resource            = module.v1_resource.aws_api_gateway_resource
   v1_dataset_id_resource = module.dataset.v1_dataset_id_resource
 
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/main.tf
index 6bf67188..e3f27ee4 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/main.tf
@@ -340,6 +340,7 @@ module "analysis_gee_get_v1_recent_tiles_classifier" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/recent-tiles-classifier"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_composite_service" {
@@ -351,6 +352,7 @@ module "analysis_gee_get_v1_composite_service" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/composite-service"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v1_mc_analysis" {
@@ -362,6 +364,7 @@ module "analysis_gee_post_v1_mc_analysis" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/mc-analysis"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_composite_service_geom" {
@@ -373,6 +376,7 @@ module "analysis_gee_get_v1_composite_service_geom" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/composite-service/geom"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v1_composite_service_geom" {
@@ -384,6 +388,7 @@ module "analysis_gee_post_v1_composite_service_geom" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/composite-service/geom"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_geodescriber" {
@@ -395,6 +400,7 @@ module "analysis_gee_get_v1_geodescriber" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/geodescriber"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_geodescriber_geom" {
@@ -406,6 +412,7 @@ module "analysis_gee_get_v1_geodescriber_geom" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/geodescriber/geom"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v1_geodescriber_geom" {
@@ -417,6 +424,7 @@ module "analysis_gee_post_v1_geodescriber_geom" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/geodescriber/geom"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_umd_loss_gain" {
@@ -428,6 +436,7 @@ module "analysis_gee_get_v1_umd_loss_gain" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/umd-loss-gain"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v1_umd_loss_gain" {
@@ -439,6 +448,7 @@ module "analysis_gee_post_v1_umd_loss_gain" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/umd-loss-gain"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v1_umd_loss_gain_proxy" {
@@ -450,6 +460,7 @@ module "analysis_gee_any_v1_umd_loss_gain_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/umd-loss-gain/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_whrc_biomass" {
@@ -461,6 +472,7 @@ module "analysis_gee_get_v1_whrc_biomass" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/whrc-biomass"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v1_whrc_biomass" {
@@ -472,6 +484,7 @@ module "analysis_gee_post_v1_whrc_biomass" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/whrc-biomass"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v1_whrc_biomass_proxy" {
@@ -483,6 +496,7 @@ module "analysis_gee_any_v1_whrc_biomass_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/whrc-biomass/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v1_mangrove_biomass" {
@@ -494,6 +508,7 @@ module "analysis_gee_post_v1_mangrove_biomass" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/mangrove-biomass"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_mangrove_biomass" {
@@ -505,6 +520,7 @@ module "analysis_gee_get_v1_mangrove_biomass" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/mangrove-biomass"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v1_mangrove_biomass_proxy" {
@@ -516,6 +532,7 @@ module "analysis_gee_any_v1_mangrove_biomass_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/mangrove-biomass/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_population" {
@@ -527,6 +544,7 @@ module "analysis_gee_get_v1_population" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/population"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v1_population" {
@@ -538,6 +556,7 @@ module "analysis_gee_post_v1_population" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/population"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v1_population_proxy" {
@@ -549,6 +568,7 @@ module "analysis_gee_any_v1_population_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/population/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_soil_carbon" {
@@ -560,6 +580,7 @@ module "analysis_gee_get_v1_soil_carbon" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/soil-carbon"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v1_soil_carbon_proxy" {
@@ -571,6 +592,7 @@ module "analysis_gee_any_v1_soil_carbon_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/soil-carbon/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v1_forma250gfw" {
@@ -582,6 +604,7 @@ module "analysis_gee_post_v1_forma250gfw" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/forma250gfw"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_forma250gfw" {
@@ -593,6 +616,7 @@ module "analysis_gee_get_v1_forma250gfw" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/forma250gfw"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v1_forma250gfw_proxy" {
@@ -604,6 +628,7 @@ module "analysis_gee_any_v1_forma250gfw_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/forma250gfw/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_biomass_loss" {
@@ -615,6 +640,7 @@ module "analysis_gee_get_v1_biomass_loss" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/biomass-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v1_biomass_loss" {
@@ -626,6 +652,7 @@ module "analysis_gee_post_v1_biomass_loss" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/biomass-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v1_biomass_loss_proxy" {
@@ -637,6 +664,7 @@ module "analysis_gee_any_v1_biomass_loss_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/biomass-loss/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_loss_by_landcover" {
@@ -648,6 +676,7 @@ module "analysis_gee_get_v1_loss_by_landcover" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/loss-by-landcover"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v1_loss_by_landcover" {
@@ -659,6 +688,7 @@ module "analysis_gee_post_v1_loss_by_landcover" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/loss-by-landcover"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_landcover" {
@@ -670,6 +700,7 @@ module "analysis_gee_get_v1_landcover" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/landcover"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v1_landcover" {
@@ -681,6 +712,7 @@ module "analysis_gee_post_v1_landcover" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/landcover"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v1_landsat_tiles_proxy" {
@@ -692,6 +724,7 @@ module "analysis_gee_any_v1_landsat_tiles_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/landsat-tiles/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_sentinel_tiles" {
@@ -703,6 +736,7 @@ module "analysis_gee_get_v1_sentinel_tiles" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/sentinel-tiles"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v1_recent_tiles" {
@@ -714,6 +748,7 @@ module "analysis_gee_get_v1_recent_tiles" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/recent-tiles"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v1_recent_tiles_proxy" {
@@ -725,6 +760,7 @@ module "analysis_gee_any_v1_recent_tiles_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v1/recent-tiles/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v2_landsat_tiles_proxy" {
@@ -736,6 +772,7 @@ module "analysis_gee_any_v2_landsat_tiles_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v2/landsat-tiles/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v2_nlcd_landcover" {
@@ -747,6 +784,7 @@ module "analysis_gee_get_v2_nlcd_landcover" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v2/nlcd-landcover"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v2_nlcd_landcover" {
@@ -758,6 +796,7 @@ module "analysis_gee_post_v2_nlcd_landcover" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v2/nlcd-landcover"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v2_nlcd_landcover_proxy" {
@@ -769,6 +808,7 @@ module "analysis_gee_any_v2_nlcd_landcover_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v2/nlcd-landcover/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_get_v2_biomass_loss" {
@@ -780,6 +820,7 @@ module "analysis_gee_get_v2_biomass_loss" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v2/biomass-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_post_v2_biomass_loss" {
@@ -791,6 +832,7 @@ module "analysis_gee_post_v2_biomass_loss" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v2/biomass-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "analysis_gee_any_v2_biomass_loss_proxy" {
@@ -802,4 +844,5 @@ module "analysis_gee_any_v2_biomass_loss_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30500/api/v2/biomass-loss/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/variables.tf
index 744b794f..6a25d47e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/analysis-gee/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v2_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/main.tf
index 3de8aca0..1c598ada 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/main.tf
@@ -89,4 +89,5 @@ module "aqueduct_analysis_any_v1_aqueduct_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30501/api/v1/aqueduct/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/aqueduct-analysis/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/main.tf
index f993921f..40831e9f 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/main.tf
@@ -89,4 +89,5 @@ module "arcgis_proxy_any_v1_arcgis_proxy_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30503/api/v1/arcgis-proxy/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis-proxy/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/main.tf
index 455e366a..fbdb23a2 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/main.tf
@@ -137,6 +137,7 @@ module "arcgis_get_v1_query_featureservice_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30502/api/v1/arcgis/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "arcgis_post_v1_query_featureservice_dataset_id" {
@@ -148,6 +149,7 @@ module "arcgis_post_v1_query_featureservice_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30502/api/v1/arcgis/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "arcgis_get_v1_download_featureservice_dataset_id" {
@@ -159,6 +161,7 @@ module "arcgis_get_v1_download_featureservice_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30502/api/v1/arcgis/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "arcgis_post_v1_download_featureservice_dataset_id" {
@@ -170,6 +173,7 @@ module "arcgis_post_v1_download_featureservice_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30502/api/v1/arcgis/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "arcgis_get_v1_fields_featureservice_dataset_id" {
@@ -181,6 +185,7 @@ module "arcgis_get_v1_fields_featureservice_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30502/api/v1/arcgis/fields/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "arcgis_post_v1_rest_datasets_featureservice" {
@@ -192,6 +197,7 @@ module "arcgis_post_v1_rest_datasets_featureservice" {
   uri             = "http://${local.api_gateway_target_url}:30502/api/v1/arcgis/rest-datasets/featureservice"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "arcgis_delete_v1_rest_datasets_featureservice_dataset_id" {
@@ -203,4 +209,5 @@ module "arcgis_delete_v1_rest_datasets_featureservice_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30502/api/v1/arcgis/rest-datasets/featureservice/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/variables.tf
index 35bef086..17cfad2f 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/arcgis/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -92,4 +97,4 @@ variable "v1_rest_datasets_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/main.tf
index 6442702c..ffcd5448 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/main.tf
@@ -139,6 +139,7 @@ module "area_get_area_v2" {
   uri             = "http://${local.api_gateway_target_url}:30504/api/v2/area"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "area_post_area_v2" {
@@ -150,6 +151,7 @@ module "area_post_area_v2" {
   uri             = "http://${local.api_gateway_target_url}:30504/api/v2/area"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "area_any_area_v2_proxy" {
@@ -161,6 +163,7 @@ module "area_any_area_v2_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30504/api/v2/area/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "area_get_v1_area" {
@@ -172,6 +175,7 @@ module "area_get_v1_area" {
   uri             = "http://${local.api_gateway_target_url}:30504/api/v1/area"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "area_post_v1_area" {
@@ -183,6 +187,7 @@ module "area_post_v1_area" {
   uri             = "http://${local.api_gateway_target_url}:30504/api/v1/area"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "area_any_v1_area_proxy" {
@@ -194,6 +199,7 @@ module "area_any_v1_area_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30504/api/v1/area/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "area_any_v1_download_tiles_proxy" {
@@ -205,6 +211,7 @@ module "area_any_v1_download_tiles_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30504/api/v1/download-tiles/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "area_any_v2_download_tiles_proxy" {
@@ -216,4 +223,5 @@ module "area_any_v2_download_tiles_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30504/api/v2/download-tiles/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/variables.tf
index 744b794f..6a25d47e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/area/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v2_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/main.tf
index dc5a0215..08b99f71 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/main.tf
@@ -153,6 +153,7 @@ module "authorization_any_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30505/auth/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "authorization_get" {
@@ -164,6 +165,7 @@ module "authorization_get" {
   uri             = "http://${local.api_gateway_target_url}:30505/auth"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "authorization_get_v1_deletion" {
@@ -175,6 +177,7 @@ module "authorization_get_v1_deletion" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/deletion"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "authorization_post_v1_deletion" {
@@ -186,6 +189,7 @@ module "authorization_post_v1_deletion" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/deletion"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "authorization_any_v1_deletion_proxy" {
@@ -197,10 +201,11 @@ module "authorization_any_v1_deletion_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/deletion/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "authorization_get_v1_organization" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_organization_resource.aws_api_gateway_resource
@@ -208,10 +213,11 @@ module "authorization_get_v1_organization" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/organization"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "authorization_post_v1_organization" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_organization_resource.aws_api_gateway_resource
@@ -219,10 +225,11 @@ module "authorization_post_v1_organization" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/organization"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "authorization_any_v1_organization_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_organization_proxy_resource.aws_api_gateway_resource
@@ -230,10 +237,11 @@ module "authorization_any_v1_organization_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/organization/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "authorization_get_v1_application" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_application_resource.aws_api_gateway_resource
@@ -241,10 +249,11 @@ module "authorization_get_v1_application" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/application"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "authorization_post_v1_application" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_application_resource.aws_api_gateway_resource
@@ -252,10 +261,11 @@ module "authorization_post_v1_application" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/application"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "authorization_any_v1_application_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_application_proxy_resource.aws_api_gateway_resource
@@ -263,10 +273,11 @@ module "authorization_any_v1_application_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/application/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "authorization_post_v1_request_validate" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.v1_request_validate_resource.aws_api_gateway_resource
@@ -274,4 +285,5 @@ module "authorization_post_v1_request_validate" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/request/validate"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/variables.tf
index e949be07..0411216b 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -72,4 +77,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/main.tf
index af157515..fd3ac478 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/main.tf
@@ -129,6 +129,7 @@ module "bigquery_get_v1_query_bigquery_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30506/api/v1/bigquery/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "bigquery_post_v1_query_bigquery_dataset_id" {
@@ -140,6 +141,7 @@ module "bigquery_post_v1_query_bigquery_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30506/api/v1/bigquery/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "bigquery_get_v1_download_bigquery_dataset_id" {
@@ -151,6 +153,7 @@ module "bigquery_get_v1_download_bigquery_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30506/api/v1/bigquery/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "bigquery_post_v1_download_bigquery_dataset_id" {
@@ -162,6 +165,7 @@ module "bigquery_post_v1_download_bigquery_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30506/api/v1/bigquery/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "bigquery_get_v1_fields_bigquery_dataset_id" {
@@ -173,6 +177,7 @@ module "bigquery_get_v1_fields_bigquery_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30506/api/v1/bigquery/fields/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "bigquery_post_v1_rest_datasets_bigquery" {
@@ -184,5 +189,6 @@ module "bigquery_post_v1_rest_datasets_bigquery" {
   uri             = "http://${local.api_gateway_target_url}:30506/api/v1/bigquery/rest-datasets/bigquery"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/variables.tf
index 35bef086..17cfad2f 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/bigquery/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -92,4 +97,4 @@ variable "v1_rest_datasets_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/main.tf
index 9543ec9c..ce8acec5 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/main.tf
@@ -90,4 +90,5 @@ module "biomass_v1_any_biomass_loss_admin_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30533/api/v1/biomass-loss/admin/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/variables.tf
index 8d4086a3..47de736f 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/biomass/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v1_biomass_loss_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/main.tf
index ceda5076..9664201e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/main.tf
@@ -137,6 +137,7 @@ module "carto_get_v1_query_cartodb_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30507/api/v1/carto/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "carto_post_v1_query_cartodb_dataset_id" {
@@ -148,6 +149,7 @@ module "carto_post_v1_query_cartodb_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30507/api/v1/carto/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "carto_get_v1_download_cartodb_dataset_id" {
@@ -159,6 +161,7 @@ module "carto_get_v1_download_cartodb_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30507/api/v1/carto/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "carto_post_v1_download_cartodb_dataset_id" {
@@ -170,6 +173,7 @@ module "carto_post_v1_download_cartodb_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30507/api/v1/carto/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "carto_get_v1_fields_cartodb_dataset_id" {
@@ -181,6 +185,7 @@ module "carto_get_v1_fields_cartodb_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30507/api/v1/carto/fields/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "carto_post_v1_rest_datasets_cartodb" {
@@ -192,6 +197,7 @@ module "carto_post_v1_rest_datasets_cartodb" {
   uri             = "http://${local.api_gateway_target_url}:30507/api/v1/carto/rest-datasets/cartodb"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "carto_delete_v1_rest_datasets_cartodb_dataset_id" {
@@ -203,5 +209,6 @@ module "carto_delete_v1_rest_datasets_cartodb_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30507/api/v1/carto/rest-datasets/cartodb/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/variables.tf
index 35bef086..17cfad2f 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/carto/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -92,4 +97,4 @@ variable "v1_rest_datasets_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/main.tf
index 1d28c0f6..f97c01ab 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/main.tf
@@ -89,4 +89,5 @@ module "converter_any_convert_fs2sql" {
   uri             = "http://${local.api_gateway_target_url}:30514/api/v1/convert/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/converter/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/main.tf
index c692c0b8..ff6c2500 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/main.tf
@@ -137,9 +137,7 @@ module "dataset_get_dataset" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  authorizer_id   = var.authorizer_id
   require_api_key = var.require_api_key
-  authorization   = var.authorization
 }
 
 module "dataset_get_dataset_id" {
@@ -151,9 +149,7 @@ module "dataset_get_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  authorizer_id   = var.authorizer_id
   require_api_key = var.require_api_key
-  authorization   = var.authorization
 }
 
 module "dataset_update_dataset_id" {
@@ -165,9 +161,7 @@ module "dataset_update_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  authorizer_id   = var.authorizer_id
   require_api_key = var.require_api_key
-  authorization   = var.authorization
 }
 
 module "dataset_delete_dataset_id" {
@@ -179,9 +173,7 @@ module "dataset_delete_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  authorizer_id   = var.authorizer_id
   require_api_key = var.require_api_key
-  authorization   = var.authorization
 }
 
 module "dataset_post_dataset" {
@@ -193,13 +185,11 @@ module "dataset_post_dataset" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  authorizer_id   = var.authorizer_id
   require_api_key = var.require_api_key
-  authorization   = var.authorization
 }
 
 module "dataset_delete_dataset_id_proxy" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.dataset_by_user_id_resource.aws_api_gateway_resource
@@ -207,6 +197,7 @@ module "dataset_delete_dataset_id_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset/by-user/{userId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "dataset_any_dataset_id_proxy" {
@@ -219,9 +210,7 @@ module "dataset_any_dataset_id_proxy" {
   vpc_link                    = var.vpc_link
   connection_type             = var.connection_type
   endpoint_request_parameters = ["datasetId"]
-  authorizer_id               = var.authorizer_id
   require_api_key             = var.require_api_key
-  authorization               = var.authorization
 }
 
 module "dataset_post_dataset_find_by_ids" {
@@ -233,9 +222,7 @@ module "dataset_post_dataset_find_by_ids" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset/find-by-ids"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  authorizer_id   = var.authorizer_id
   require_api_key = var.require_api_key
-  authorization   = var.authorization
 }
 
 module "dataset_post_dataset_upload" {
@@ -247,7 +234,5 @@ module "dataset_post_dataset_upload" {
   uri             = "http://${local.api_gateway_target_url}:30516/api/v1/dataset/upload"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  authorizer_id   = var.authorizer_id
   require_api_key = var.require_api_key
-  authorization   = var.authorization
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/variables.tf
index 459d2565..e47fc766 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/dataset/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "eks_asg_names" {
   type        = list(any)
   description = "List of the EKS ASG names"
@@ -69,26 +74,3 @@ variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
 }
-
-variable "authorizer_id" {
-  type    = string
-  default = ""
-}
-
-variable "require_api_key" {
-  type    = bool
-  default = false
-}
-
-variable "authorization" {
-  default = "NONE"
-  validation {
-    condition = contains([
-      "NONE",
-      "CUSTOM",
-      "AWS_IAM",
-      "COGNITO_USER_POOLS"
-    ], var.authorization)
-    error_message = "Unknown authorization method."
-  }
-}
\ No newline at end of file
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/main.tf
index 1a5b6654..7b216959 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/main.tf
@@ -89,4 +89,5 @@ module "doc_orchestrator_any_doc_importer_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30518/api/v1/doc-importer/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/doc-orchestrator/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/main.tf
index 094b2adf..3c6befed 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/main.tf
@@ -313,6 +313,7 @@ module "document_adapter_get_query_csv_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/query/csv/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_post_query_csv_dataset_id" {
@@ -324,6 +325,7 @@ module "document_adapter_post_query_csv_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/query/csv/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_get_query_json_dataset_id" {
@@ -335,6 +337,7 @@ module "document_adapter_get_query_json_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/query/json/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_post_query_json_dataset_id" {
@@ -346,6 +349,7 @@ module "document_adapter_post_query_json_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/query/json/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_get_query_tsv_dataset_id" {
@@ -357,6 +361,7 @@ module "document_adapter_get_query_tsv_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/query/tsv/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_post_query_tsv_dataset_id" {
@@ -368,6 +373,7 @@ module "document_adapter_post_query_tsv_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/query/tsv/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_get_query_xml_dataset_id" {
@@ -379,6 +385,7 @@ module "document_adapter_get_query_xml_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/query/xml/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_post_query_xml_dataset_id" {
@@ -390,6 +397,7 @@ module "document_adapter_post_query_xml_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/query/xml/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_get_download_csv_dataset_id" {
@@ -401,6 +409,7 @@ module "document_adapter_get_download_csv_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/download/csv/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_post_download_csv_dataset_id" {
@@ -412,6 +421,7 @@ module "document_adapter_post_download_csv_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/download/csv/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_get_download_json_dataset_id" {
@@ -423,6 +433,7 @@ module "document_adapter_get_download_json_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/download/json/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_post_download_json_dataset_id" {
@@ -434,6 +445,7 @@ module "document_adapter_post_download_json_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/download/json/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_get_download_tsv_dataset_id" {
@@ -445,6 +457,7 @@ module "document_adapter_get_download_tsv_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/download/tsv/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_post_download_tsv_dataset_id" {
@@ -456,6 +469,7 @@ module "document_adapter_post_download_tsv_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/download/tsv/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_get_download_xml_dataset_id" {
@@ -467,6 +481,7 @@ module "document_adapter_get_download_xml_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/download/xml/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_post_download_xml_dataset_id" {
@@ -478,6 +493,7 @@ module "document_adapter_post_download_xml_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/download/xml/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_get_fields_csv_dataset_id" {
@@ -489,6 +505,7 @@ module "document_adapter_get_fields_csv_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/fields/csv/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_get_fields_json_dataset_id" {
@@ -500,6 +517,7 @@ module "document_adapter_get_fields_json_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/fields/json/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_get_fields_tsv_dataset_id" {
@@ -511,6 +529,7 @@ module "document_adapter_get_fields_tsv_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/fields/tsv/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_get_fields_xml_dataset_id" {
@@ -522,6 +541,7 @@ module "document_adapter_get_fields_xml_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/fields/xml/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "document_adapter_post_dataset_id_concat" {
@@ -581,4 +601,5 @@ module "document_adapter_any_doc_datasets_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30521/api/v1/document/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/variables.tf
index 75fe3134..68624fc6 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/document-adapter/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -92,4 +97,4 @@ variable "v1_dataset_id_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/main.tf
index 0e354266..dfa036cb 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/main.tf
@@ -113,6 +113,7 @@ module "fires_summary_stats_any_fire_alerts_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30523/api/v1/fire-alerts/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "fires_summary_stats_any_glad_alerts_summary_stats_proxy" {
@@ -124,5 +125,6 @@ module "fires_summary_stats_any_glad_alerts_summary_stats_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30523/api/v1/glad-alerts/summary-stats/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fires-summary-stats/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/main.tf
index 6351321a..6c0faebf 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/main.tf
@@ -89,6 +89,7 @@ module "forest_change_get_v1_terrai_alerts" {
   uri             = "http://${local.api_gateway_target_url}:30524/api/v2/ms/terrai-alerts"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "forest_change_post_v1_terrai_alerts" {
@@ -100,6 +101,7 @@ module "forest_change_post_v1_terrai_alerts" {
   uri             = "http://${local.api_gateway_target_url}:30524/api/v2/ms/terrai-alerts"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "forest_change_any_v1_terrai_alerts_admin_iso_code" {
@@ -111,4 +113,5 @@ module "forest_change_any_v1_terrai_alerts_admin_iso_code" {
   uri             = "http://${local.api_gateway_target_url}:30524/api/v2/ms/terrai-alerts/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-change/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-watcher-api/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-watcher-api/variables.tf
index 5dcd15e1..b0f256b8 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-watcher-api/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forest-watcher-api/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -73,4 +78,4 @@ variable "v1_resource" {
 variable "backend_url" {
   type        = string
   description = "The URL of the backend server to which the request is proxied"
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forms/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forms/variables.tf
index 5dcd15e1..b0f256b8 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forms/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/forms/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -73,4 +78,4 @@ variable "v1_resource" {
 variable "backend_url" {
   type        = string
   description = "The URL of the backend server to which the request is proxied"
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-alerts/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-alerts/variables.tf
index 5dcd15e1..b0f256b8 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-alerts/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-alerts/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -73,4 +78,4 @@ variable "v1_resource" {
 variable "backend_url" {
   type        = string
   description = "The URL of the backend server to which the request is proxied"
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-contextual-layers/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-contextual-layers/variables.tf
index 5dcd15e1..b0f256b8 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-contextual-layers/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-contextual-layers/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -73,4 +78,4 @@ variable "v1_resource" {
 variable "backend_url" {
   type        = string
   description = "The URL of the backend server to which the request is proxied"
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-teams/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-teams/variables.tf
index 5dcd15e1..b0f256b8 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-teams/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/fw-teams/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -73,4 +78,4 @@ variable "v1_resource" {
 variable "backend_url" {
   type        = string
   description = "The URL of the backend server to which the request is proxied"
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/main.tf
index 51703820..8735bf0a 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/main.tf
@@ -125,4 +125,5 @@ module "gee_tiles_any_gee_layer_gee_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30531/api/v1/layer/gee/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/variables.tf
index 9727d7c5..09d85365 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee-tiles/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -80,4 +85,4 @@ variable "v1_layer_id_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/main.tf
index c6d2e03e..fb409e5c 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/main.tf
@@ -137,6 +137,7 @@ module "gee_get_query_gee_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30530/api/v1/earthengine/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gee_post_query_gee_dataset_id" {
@@ -148,6 +149,7 @@ module "gee_post_query_gee_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30530/api/v1/earthengine/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gee_get_download_gee_dataset_id" {
@@ -159,6 +161,7 @@ module "gee_get_download_gee_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30530/api/v1/earthengine/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gee_post_download_gee_dataset_id" {
@@ -170,6 +173,7 @@ module "gee_post_download_gee_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30530/api/v1/earthengine/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gee_get_fields_gee_dataset_id" {
@@ -181,6 +185,7 @@ module "gee_get_fields_gee_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30530/api/v1/earthengine/fields/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gee_get_rest_datasets_gee" {
@@ -192,6 +197,7 @@ module "gee_get_rest_datasets_gee" {
   uri             = "http://${local.api_gateway_target_url}:30530/api/v1/earthengine/rest-datasets/gee"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gee_delete_rest_datasets_gee_dataset_id" {
@@ -203,4 +209,5 @@ module "gee_delete_rest_datasets_gee_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30530/api/v1/earthengine/rest-datasets/gee/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/variables.tf
index 35bef086..17cfad2f 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gee/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -92,4 +97,4 @@ variable "v1_rest_datasets_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/main.tf
index 9eb6589d..e56c216e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/main.tf
@@ -94,6 +94,7 @@ module "geostore_post_v1_geostore" {
   uri             = "http://${local.api_gateway_target_url}:30532/api/v1/geostore"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "geostore_any_v1_geostore_proxy" {
@@ -105,6 +106,7 @@ module "geostore_any_v1_geostore_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30532/api/v1/geostore/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 #
@@ -136,6 +138,7 @@ module "geostore_any_v1_coverage_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30532/api/v1/coverage/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 #
@@ -167,6 +170,7 @@ module "geostore_post_v2_geostore" {
   uri             = "http://${local.api_gateway_target_url}:30532/api/v2/geostore"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "geostore_any_v2_geostore_proxy" {
@@ -178,6 +182,7 @@ module "geostore_any_v2_geostore_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30532/api/v2/geostore/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 #
@@ -209,4 +214,5 @@ module "geostore_any_v2_coverage_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30532/api/v2/coverage/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/variables.tf
index 744b794f..6a25d47e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/geostore/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v2_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/main.tf
index 50558941..ea4ed88d 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/main.tf
@@ -138,6 +138,7 @@ module "gfw_get_v1_query_gfw_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:${local.port}/api/v1/gfw/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_post_v1_query_gfw_dataset_id" {
@@ -149,6 +150,7 @@ module "gfw_post_v1_query_gfw_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:${local.port}/api/v1/gfw/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_get_v1_download_gfw_dataset_id" {
@@ -160,6 +162,7 @@ module "gfw_get_v1_download_gfw_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:${local.port}/api/v1/gfw/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_post_v1_download_gfw_dataset_id" {
@@ -171,6 +174,7 @@ module "gfw_post_v1_download_gfw_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:${local.port}/api/v1/gfw/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_get_v1_fields_gfw_dataset_id" {
@@ -182,6 +186,7 @@ module "gfw_get_v1_fields_gfw_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:${local.port}/api/v1/gfw/fields/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_post_v1_rest_datasets_gfw" {
@@ -193,6 +198,7 @@ module "gfw_post_v1_rest_datasets_gfw" {
   uri             = "http://${local.api_gateway_target_url}:${local.port}/api/v1/gfw/rest-datasets/gfw"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_delete_v1_rest_datasets_gfw_dataset_id" {
@@ -204,5 +210,6 @@ module "gfw_delete_v1_rest_datasets_gfw_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:${local.port}/api/v1/gfw/rest-datasets/gfw/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/variables.tf
index 35bef086..17cfad2f 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-adapter/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -92,4 +97,4 @@ variable "v1_rest_datasets_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/main.tf
index 633bc82a..366992ca 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/main.tf
@@ -90,4 +90,5 @@ module "gfw_contact_any_v1_form_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30570/api/v1/form/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-contact/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/main.tf
index 33149fd1..3df1bf4d 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/main.tf
@@ -89,6 +89,7 @@ module "gfw_forma_get_v1_forma_alerts" {
   uri             = "http://${local.api_gateway_target_url}:30534/api/v1/forma-alerts"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_forma_post_v1_forma_alerts" {
@@ -100,6 +101,7 @@ module "gfw_forma_post_v1_forma_alerts" {
   uri             = "http://${local.api_gateway_target_url}:30534/api/v1/forma-alerts"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_forma_any_v1_forma_alerts_proxy" {
@@ -111,4 +113,5 @@ module "gfw_forma_any_v1_forma_alerts_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30534/api/v1/forma-alerts/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-forma/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/main.tf
index a15d96e3..046c7570 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/main.tf
@@ -106,6 +106,7 @@ module "gfw_guira_get_v2_guira_loss" {
   uri             = "http://${local.api_gateway_target_url}:30535/api/v2/guira-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_guira_post_v2_guira_loss" {
@@ -117,6 +118,7 @@ module "gfw_guira_post_v2_guira_loss" {
   uri             = "http://${local.api_gateway_target_url}:30535/api/v2/guira-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_guira_any_v2_guira_loss_proxy" {
@@ -128,6 +130,7 @@ module "gfw_guira_any_v2_guira_loss_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30535/api/v2/guira-loss/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_guira_get_v1_guira_loss" {
@@ -139,6 +142,7 @@ module "gfw_guira_get_v1_guira_loss" {
   uri             = "http://${local.api_gateway_target_url}:30535/api/v1/guira-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_guira_post_v1_guira_loss" {
@@ -150,6 +154,7 @@ module "gfw_guira_post_v1_guira_loss" {
   uri             = "http://${local.api_gateway_target_url}:30535/api/v1/guira-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_guira_any_v1_guira_loss_proxy" {
@@ -161,4 +166,5 @@ module "gfw_guira_any_v1_guira_loss_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30535/api/v1/guira-loss/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/variables.tf
index 744b794f..6a25d47e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-guira/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v2_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/main.tf
index 3ac31c63..c36b843b 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/main.tf
@@ -89,4 +89,5 @@ module "gfw_ogr_any_v1_gfw_pro_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30568/api/v1/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/main.tf
index 07bbc0ef..2907b8f6 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/main.tf
@@ -106,6 +106,7 @@ module "gfw_ogr_any_v2_ogr_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30536/api/v2/ogr/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_ogr_any_v1_ogr_proxy" {
@@ -117,4 +118,5 @@ module "gfw_ogr_any_v1_ogr_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30536/api/v1/ogr/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/variables.tf
index 744b794f..6a25d47e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v2_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/main.tf
index 43f43af0..a17a2ba3 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/main.tf
@@ -106,6 +106,7 @@ module "gfw_prodes_loss_get_v2_prodes_loss" {
   uri             = "http://${local.api_gateway_target_url}:30537/api/v2/prodes-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_prodes_loss_post_v2_prodes_loss" {
@@ -117,6 +118,7 @@ module "gfw_prodes_loss_post_v2_prodes_loss" {
   uri             = "http://${local.api_gateway_target_url}:30537/api/v2/prodes-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_prodes_loss_any_v2_prodes_loss_proxy" {
@@ -128,6 +130,7 @@ module "gfw_prodes_loss_any_v2_prodes_loss_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30537/api/v2/prodes-loss/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_prodes_loss_any_v1_prodes_loss_proxy" {
@@ -139,6 +142,7 @@ module "gfw_prodes_loss_any_v1_prodes_loss_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30537/api/v1/prodes-loss/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_prodes_loss_get_v1_prodes_loss" {
@@ -150,6 +154,7 @@ module "gfw_prodes_loss_get_v1_prodes_loss" {
   uri             = "http://${local.api_gateway_target_url}:30537/api/v1/prodes-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_prodes_loss_post_v1_prodes_loss" {
@@ -161,4 +166,5 @@ module "gfw_prodes_loss_post_v1_prodes_loss" {
   uri             = "http://${local.api_gateway_target_url}:30537/api/v1/prodes-loss"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/variables.tf
index 744b794f..6a25d47e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v2_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/main.tf
index c53a16fd..2c95f8f4 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/main.tf
@@ -121,6 +121,7 @@ module "gfw_umd_loss_any_v1_umd_loss_gain_admin_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30539/api/v1/umd-loss-gain/admin/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_umd_loss_any_v2_umd_loss_proxy" {
@@ -132,6 +133,7 @@ module "gfw_umd_loss_any_v2_umd_loss_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30539/api/v2/umd-loss-gain/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_umd_loss_any_v3_umd_loss_proxy" {
@@ -143,4 +145,5 @@ module "gfw_umd_loss_any_v3_umd_loss_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30539/api/v3/umd-loss-gain/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/variables.tf
index 30937d73..e9be58fb 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-umd/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -86,4 +91,4 @@ variable "v1_umd_loss_gain_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/main.tf
index bda717e4..5b77532a 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/main.tf
@@ -105,6 +105,7 @@ module "gfw_user_get_v1_user" {
   uri             = "http://${local.api_gateway_target_url}:30540/api/v1/user"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_user_post_v1_user" {
@@ -116,6 +117,7 @@ module "gfw_user_post_v1_user" {
   uri             = "http://${local.api_gateway_target_url}:30540/api/v1/user"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_user_any_v1_user_proxy" {
@@ -127,6 +129,7 @@ module "gfw_user_any_v1_user_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30540/api/v1/user/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_user_get_v2_user" {
@@ -138,6 +141,7 @@ module "gfw_user_get_v2_user" {
   uri             = "http://${local.api_gateway_target_url}:30540/api/v2/user"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_user_post_v2_user" {
@@ -149,6 +153,7 @@ module "gfw_user_post_v2_user" {
   uri             = "http://${local.api_gateway_target_url}:30540/api/v2/user"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gfw_user_any_v2_user_proxy" {
@@ -160,4 +165,5 @@ module "gfw_user_any_v2_user_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30540/api/v2/user/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/variables.tf
index 744b794f..6a25d47e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-user/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v2_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/main.tf
index 799b597a..a77f5dd8 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/main.tf
@@ -137,6 +137,7 @@ module "glad_analysis_tiled_any_v1_glad_alerts_admin_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30541/api/v1/glad-alerts-athena/admin/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "glad_analysis_tiled_get_v1_glad_alerts_download" {
@@ -148,6 +149,7 @@ module "glad_analysis_tiled_get_v1_glad_alerts_download" {
   uri             = "http://${local.api_gateway_target_url}:30541/api/v1/glad-alerts-athena/download"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "glad_analysis_tiled_post_v1_glad_alerts_download" {
@@ -159,6 +161,7 @@ module "glad_analysis_tiled_post_v1_glad_alerts_download" {
   uri             = "http://${local.api_gateway_target_url}:30541/api/v1/glad-alerts-athena/download"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "glad_analysis_tiled_get_v1_glad_alerts" {
@@ -170,6 +173,7 @@ module "glad_analysis_tiled_get_v1_glad_alerts" {
   uri             = "http://${local.api_gateway_target_url}:30541/api/v1/glad-alerts-athena"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "glad_analysis_tiled_post_v1_glad_alerts" {
@@ -181,6 +185,7 @@ module "glad_analysis_tiled_post_v1_glad_alerts" {
   uri             = "http://${local.api_gateway_target_url}:30541/api/v1/glad-alerts-athena"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "glad_analysis_tiled_get_v1_glad_alerts_latest" {
@@ -192,6 +197,7 @@ module "glad_analysis_tiled_get_v1_glad_alerts_latest" {
   uri             = "http://${local.api_gateway_target_url}:30541/api/v1/glad-alerts-athena/latest"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "glad_analysis_tiled_any_v1_glad_alerts_wdpa_proxy" {
@@ -203,6 +209,7 @@ module "glad_analysis_tiled_any_v1_glad_alerts_wdpa_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30541/api/v1/glad-alerts-athena/wdpa/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "glad_analysis_tiled_any_v1_glad_alerts_use_proxy" {
@@ -214,5 +221,6 @@ module "glad_analysis_tiled_any_v1_glad_alerts_use_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30541/api/v1/glad-alerts-athena/use/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/variables.tf
index 9f10e20b..3285a936 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/glad-analysis-tiled/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -75,4 +80,4 @@ variable "v1_glad_alerts_resource" {
     id        = string
     path_part = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/main.tf
index b329def7..a2b7ac41 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/main.tf
@@ -90,4 +90,5 @@ module "graph_client_any_graph_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30542/api/v1/graph/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/graph-client/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/main.tf
index a81c0be9..c7590924 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/main.tf
@@ -89,5 +89,6 @@ module "gs_pro_config_get_v1_pro_config_tech_title" {
   uri             = "http://${local.api_gateway_target_url}:30543/api/v1/pro-config/{techTitle}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gs-pro-config/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/main.tf
index eba8df8d..aa8fac59 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/main.tf
@@ -89,5 +89,6 @@ module "high_res_get_v1_high_res_sensor" {
   uri             = "http://${local.api_gateway_target_url}:30544/api/v1/high-res/{sensor}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/high-res/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/main.tf
index aea963c6..c32a1d82 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/main.tf
@@ -106,6 +106,7 @@ module "imazon_get_v1_imazon_alerts" {
   uri             = "http://${local.api_gateway_target_url}:30545/api/v1/imazon-alerts"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "imazon_post_v1_imazon_alerts" {
@@ -117,6 +118,7 @@ module "imazon_post_v1_imazon_alerts" {
   uri             = "http://${local.api_gateway_target_url}:30545/api/v1/imazon-alerts"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "imazon_any_v1_imazon_alerts_proxy" {
@@ -128,6 +130,7 @@ module "imazon_any_v1_imazon_alerts_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30545/api/v1/imazon-alerts/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "imazon_get_v2_imazon_alerts" {
@@ -139,6 +142,7 @@ module "imazon_get_v2_imazon_alerts" {
   uri             = "http://${local.api_gateway_target_url}:30545/api/v2/imazon-alerts"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "imazon_post_v2_imazon_alerts" {
@@ -150,6 +154,7 @@ module "imazon_post_v2_imazon_alerts" {
   uri             = "http://${local.api_gateway_target_url}:30545/api/v2/imazon-alerts"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "imazon_any_v2_imazon_alerts_proxy" {
@@ -161,4 +166,5 @@ module "imazon_any_v2_imazon_alerts_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30545/api/v2/imazon-alerts/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/variables.tf
index 744b794f..6a25d47e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/imazon/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v2_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/main.tf
index a6e493e9..a2610f29 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/main.tf
@@ -154,6 +154,7 @@ module "layer_get" {
   uri             = "http://${local.api_gateway_target_url}:30546/api/v1/layer"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "layer_get_dataset_id_layer" {
@@ -189,6 +190,7 @@ module "layer_get_layer_id" {
   uri             = "http://${local.api_gateway_target_url}:30546/api/v1/layer/{layerId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "layer_post_dataset_id_layer" {
@@ -260,10 +262,11 @@ module "layer_post_layer_find_by_ids" {
   uri             = "http://${local.api_gateway_target_url}:30546/api/v1/layer/find-by-ids"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "layer_post_layer_by_user_layer_id" {
-  source          = "../endpoint"
+  source          = "../../endpoint"
   x_rw_domain     = var.x_rw_domain
   api_gateway     = var.api_gateway
   api_resource    = module.layer_by_user_layer_id_resource.aws_api_gateway_resource
@@ -271,6 +274,7 @@ module "layer_post_layer_by_user_layer_id" {
   uri             = "http://${local.api_gateway_target_url}:30546/api/v1/layer/by-user/{layerId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "layer_delete_layer_id_expire_cache" {
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/variables.tf
index 437776d1..d89d5f32 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/layer/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v1_dataset_id_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/main.tf
index 82e58ae4..16178d58 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/main.tf
@@ -162,6 +162,7 @@ module "metadata_get" {
   uri             = "http://${local.api_gateway_target_url}:30548/api/v1/metadata"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 // Dataset
@@ -333,6 +334,7 @@ module "metadata_dataset_post_find_by_ids" {
   uri             = "http://${local.api_gateway_target_url}:30548/api/v1/dataset/metadata/find-by-ids"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "metadata_layer_post_find_by_ids" {
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/variables.tf
index 0dc94fbe..b06fd58c 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/metadata/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -104,4 +109,4 @@ variable "v1_dataset_id_layer_id_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/main.tf
index dc2769f3..f9fdcdda 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/main.tf
@@ -274,6 +274,7 @@ module "nexgddp_get_v1_query_nexgddp_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30549/api/v1/nexgddp/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "nexgddp_post_v1_query_nexgddp_dataset_id" {
@@ -285,6 +286,7 @@ module "nexgddp_post_v1_query_nexgddp_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30549/api/v1/nexgddp/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "nexgddp_get_v1_fields_nexgddp_dataset_id" {
@@ -296,6 +298,7 @@ module "nexgddp_get_v1_fields_nexgddp_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30549/api/v1/nexgddp/fields/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "nexgddp_post_v1_rest_datasets_nexgddp" {
@@ -307,6 +310,7 @@ module "nexgddp_post_v1_rest_datasets_nexgddp" {
   uri             = "http://${local.api_gateway_target_url}:30549/api/v1/nexgddp/rest-datasets/nexgddp"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "nexgddp_delete_v1_rest_datasets_nexgddp_dataset_id" {
@@ -318,6 +322,7 @@ module "nexgddp_delete_v1_rest_datasets_nexgddp_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30549/api/v1/nexgddp/rest-datasets/nexgddp/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "nexgddp_get_v1_query_loca_dataset_id" {
@@ -329,6 +334,7 @@ module "nexgddp_get_v1_query_loca_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30549/api/v1/nexgddp/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "nexgddp_post_v1_query_loca_dataset_id" {
@@ -340,6 +346,7 @@ module "nexgddp_post_v1_query_loca_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30549/api/v1/nexgddp/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "nexgddp_get_v1_fields_loca_dataset_id" {
@@ -351,6 +358,7 @@ module "nexgddp_get_v1_fields_loca_dataset_id" {
   uri             = "http://${local.api_gateway_target_url}:30549/api/v1/nexgddp/fields/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "nexgddp_post_v1_rest_datasets_loca" {
@@ -362,6 +370,7 @@ module "nexgddp_post_v1_rest_datasets_loca" {
   uri             = "http://${local.api_gateway_target_url}:30549/api/v1/nexgddp/rest-datasets/nexgddp"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "nexgddp_any_v1_nexgddp_proxy" {
@@ -373,6 +382,7 @@ module "nexgddp_any_v1_nexgddp_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30549/api/v1/nexgddp/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "nexgddp_any_v1_loca_proxy" {
@@ -384,6 +394,7 @@ module "nexgddp_any_v1_loca_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30549/api/v1/nexgddp/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "gee_tiles_any_layer_id_tile_nexgddp_proxy_resource" {
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/variables.tf
index 50d45c57..585161ac 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/nexgddp/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -104,4 +109,4 @@ variable "v1_layer_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/main.tf
index f18311f3..fa740a38 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/main.tf
@@ -90,4 +90,5 @@ module "gee_tiles_any_proxy_v1_proxy_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30554/api/v1/proxy/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/proxy/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/main.tf
index 14fa3033..8f515cb3 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/main.tf
@@ -130,6 +130,7 @@ module "query_get_query" {
   uri             = "http://${local.api_gateway_target_url}:30555/api/v1/query"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "query_post_query" {
@@ -141,6 +142,7 @@ module "query_post_query" {
   uri             = "http://${local.api_gateway_target_url}:30555/api/v1/query"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "query_get_query_id" {
@@ -152,6 +154,7 @@ module "query_get_query_id" {
   uri             = "http://${local.api_gateway_target_url}:30555/api/v1/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "query_post_query_id" {
@@ -163,6 +166,7 @@ module "query_post_query_id" {
   uri             = "http://${local.api_gateway_target_url}:30555/api/v1/query/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "download_get_download" {
@@ -174,6 +178,7 @@ module "download_get_download" {
   uri             = "http://${local.api_gateway_target_url}:30555/api/v1/download"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "download_post_download" {
@@ -185,6 +190,7 @@ module "download_post_download" {
   uri             = "http://${local.api_gateway_target_url}:30555/api/v1/download"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "download_get_download_id" {
@@ -196,6 +202,7 @@ module "download_get_download_id" {
   uri             = "http://${local.api_gateway_target_url}:30555/api/v1/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "download_post_download_id" {
@@ -207,6 +214,7 @@ module "download_post_download_id" {
   uri             = "http://${local.api_gateway_target_url}:30555/api/v1/download/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "jiminy_get_jiminy" {
@@ -218,6 +226,7 @@ module "jiminy_get_jiminy" {
   uri             = "http://${local.api_gateway_target_url}:30555/api/v1/jiminy"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "jiminy_post_jiminy" {
@@ -229,6 +238,7 @@ module "jiminy_post_jiminy" {
   uri             = "http://${local.api_gateway_target_url}:30555/api/v1/jiminy"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "fields_get_id" {
@@ -240,4 +250,5 @@ module "fields_get_id" {
   uri             = "http://${local.api_gateway_target_url}:30555/api/v1/fields/{datasetId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/query/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/main.tf
index 091c6892..8c1c39ef 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/main.tf
@@ -89,6 +89,7 @@ module "quicc_get_v1_quicc_alerts" {
   uri             = "http://${local.api_gateway_target_url}:30556/api/v1/quicc-alerts"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "quicc_any_v1_quicc_alerts_proxy" {
@@ -100,4 +101,5 @@ module "quicc_any_v1_quicc_alerts_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30556/api/v1/quicc-alerts/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/quicc/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/main.tf
index 50b2439b..df24bf13 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/main.tf
@@ -201,6 +201,7 @@ module "resource_watch_manager_get_v1_dashboard" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/dashboards"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_post_v1_dashboard" {
@@ -212,6 +213,7 @@ module "resource_watch_manager_post_v1_dashboard" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/dashboards"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_any_v1_dashboard_proxy" {
@@ -223,6 +225,7 @@ module "resource_watch_manager_any_v1_dashboard_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/dashboards/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_get_v1_partner" {
@@ -234,6 +237,7 @@ module "resource_watch_manager_get_v1_partner" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/partners"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_post_v1_partner" {
@@ -245,6 +249,7 @@ module "resource_watch_manager_post_v1_partner" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/partners"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_get_v1_partner_id" {
@@ -256,6 +261,7 @@ module "resource_watch_manager_get_v1_partner_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/partners/{partnerId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_patch_v1_partner_id" {
@@ -267,6 +273,7 @@ module "resource_watch_manager_patch_v1_partner_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/partners/{partnerId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_put_v1_partner_id" {
@@ -278,6 +285,7 @@ module "resource_watch_manager_put_v1_partner_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/partners/{partnerId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_delete_v1_partner_id" {
@@ -289,6 +297,7 @@ module "resource_watch_manager_delete_v1_partner_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/partners/{partnerId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_get_v1_static_page" {
@@ -300,6 +309,7 @@ module "resource_watch_manager_get_v1_static_page" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/static_pages"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_post_v1_static_page" {
@@ -311,6 +321,7 @@ module "resource_watch_manager_post_v1_static_page" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/static_pages"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_get_v1_static_page_id" {
@@ -322,6 +333,7 @@ module "resource_watch_manager_get_v1_static_page_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/static_pages/{staticPageId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_patch_v1_static_page_id" {
@@ -333,6 +345,7 @@ module "resource_watch_manager_patch_v1_static_page_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/static_pages/{staticPageId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_put_v1_static_page_id" {
@@ -344,6 +357,7 @@ module "resource_watch_manager_put_v1_static_page_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/static_pages/{staticPageId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_delete_v1_static_page_id" {
@@ -355,6 +369,7 @@ module "resource_watch_manager_delete_v1_static_page_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/static_pages/{staticPageId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_get_v1_topic" {
@@ -366,6 +381,7 @@ module "resource_watch_manager_get_v1_topic" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/topics"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_post_v1_topic" {
@@ -377,6 +393,7 @@ module "resource_watch_manager_post_v1_topic" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/topics"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_any_v1_topic_proxy" {
@@ -388,6 +405,7 @@ module "resource_watch_manager_any_v1_topic_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/topics/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_get_v1_tool" {
@@ -399,6 +417,7 @@ module "resource_watch_manager_get_v1_tool" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/tools"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_post_v1_tool" {
@@ -410,6 +429,7 @@ module "resource_watch_manager_post_v1_tool" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/tools"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_get_v1_tool_id" {
@@ -421,6 +441,7 @@ module "resource_watch_manager_get_v1_tool_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/tools/{toolId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_patch_v1_tool_id" {
@@ -432,6 +453,7 @@ module "resource_watch_manager_patch_v1_tool_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/tools/{toolId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_put_v1_tool_id" {
@@ -443,6 +465,7 @@ module "resource_watch_manager_put_v1_tool_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/tools/{toolId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_delete_v1_tool_id" {
@@ -454,6 +477,7 @@ module "resource_watch_manager_delete_v1_tool_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/tools/{toolId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_post_v1_profile" {
@@ -465,6 +489,7 @@ module "resource_watch_manager_post_v1_profile" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/profiles"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_get_v1_profile_id" {
@@ -476,6 +501,7 @@ module "resource_watch_manager_get_v1_profile_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/profiles/{profileId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_patch_v1_profile_id" {
@@ -487,6 +513,7 @@ module "resource_watch_manager_patch_v1_profile_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/profiles/{profileId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_put_v1_profile_id" {
@@ -498,6 +525,7 @@ module "resource_watch_manager_put_v1_profile_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/profiles/{profileId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_delete_v1_profile_id" {
@@ -509,6 +537,7 @@ module "resource_watch_manager_delete_v1_profile_id" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/profiles/{profileId}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_get_v1_faq" {
@@ -520,6 +549,7 @@ module "resource_watch_manager_get_v1_faq" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/faqs"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_post_v1_faq" {
@@ -531,6 +561,7 @@ module "resource_watch_manager_post_v1_faq" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/faqs"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_any_v1_faq_proxy" {
@@ -542,6 +573,7 @@ module "resource_watch_manager_any_v1_faq_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/faqs/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_post_v1_temporary_content_image" {
@@ -553,6 +585,7 @@ module "resource_watch_manager_post_v1_temporary_content_image" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/temporary_content_images"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "resource_watch_manager_post_v1_contact_us" {
@@ -564,4 +597,5 @@ module "resource_watch_manager_post_v1_contact_us" {
   uri             = "http://${local.api_gateway_target_url}:30558/api/contact-us"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/resource-watch-manager/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/main.tf
index bebd9d54..adc39ce8 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/main.tf
@@ -96,6 +96,7 @@ module "rw_lp_get_home" {
   uri             = "http://${local.api_gateway_target_url}:30559/"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "rw_lp_get_rw_lp_proxy" {
@@ -107,5 +108,6 @@ module "rw_lp_get_rw_lp_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30559/rw-lp/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/variables.tf
index dbfe4056..1168a54b 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/rw-lp/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -62,4 +67,4 @@ variable "target_url" {
   type        = string
   description = "Target URL"
   default     = null
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/main.tf
index dabf443b..bc3c71e5 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/main.tf
@@ -89,4 +89,5 @@ module "salesforce_connector_any_v1_user_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30569/api/v1/salesforce/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/salesforce-connector/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/main.tf
index a73848eb..21016f9a 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/main.tf
@@ -89,6 +89,7 @@ module "story_get_v1_story" {
   uri             = "http://${local.api_gateway_target_url}:30560/api/v1/story"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "story_post_v1_story" {
@@ -100,6 +101,7 @@ module "story_post_v1_story" {
   uri             = "http://${local.api_gateway_target_url}:30560/api/v1/story"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "story_any_v1_story_proxy" {
@@ -111,4 +113,5 @@ module "story_any_v1_story_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30560/api/v1/story/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/story/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/main.tf
index 19717fe5..3efb3fac 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/main.tf
@@ -89,6 +89,7 @@ module "subscriptions_get_v1_subscriptions" {
   uri             = "http://${local.api_gateway_target_url}:30561/api/v1/subscriptions"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "subscriptions_post_v1_subscriptions" {
@@ -100,6 +101,7 @@ module "subscriptions_post_v1_subscriptions" {
   uri             = "http://${local.api_gateway_target_url}:30561/api/v1/subscriptions"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "subscriptions_any_v1_subscriptions_proxy" {
@@ -111,4 +113,5 @@ module "subscriptions_any_v1_subscriptions_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30561/api/v1/subscriptions/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/subscriptions/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/main.tf
index 886c1d0e..9aa2cbb2 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/main.tf
@@ -90,6 +90,7 @@ module "task_async_get_task" {
   uri             = "http://${local.api_gateway_target_url}:30562/api/v1/task"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "task_async_any_task_proxy" {
@@ -101,5 +102,6 @@ module "task_async_any_task_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30562/api/v1/task/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/task-executor/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/main.tf
index d8ff4a7f..678580a2 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/main.tf
@@ -89,5 +89,6 @@ module "true_color_tiles_get_v1_true_color_tiles_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30563/api/v1/true-color-tiles/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/true-color-tiles/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/main.tf
index fe0ce224..81a87f81 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/main.tf
@@ -107,6 +107,7 @@ module "viirs_fires_get_v1_viirs_active_fires" {
   uri             = "http://${local.api_gateway_target_url}:30564/api/v1/viirs-active-fires"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "viirs_fires_post_v1_viirs_active_fires" {
@@ -118,6 +119,7 @@ module "viirs_fires_post_v1_viirs_active_fires" {
   uri             = "http://${local.api_gateway_target_url}:30564/api/v1/viirs-active-fires"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "viirs_fires_any_v1_viirs_active_fires_proxy" {
@@ -129,6 +131,7 @@ module "viirs_fires_any_v1_viirs_active_fires_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30564/api/v1/viirs-active-fires/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "viirs_fires_get_v2_viirs_active_fires" {
@@ -140,6 +143,7 @@ module "viirs_fires_get_v2_viirs_active_fires" {
   uri             = "http://${local.api_gateway_target_url}:30564/api/v2/viirs-active-fires"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "viirs_fires_post_v2_viirs_active_fires" {
@@ -151,6 +155,7 @@ module "viirs_fires_post_v2_viirs_active_fires" {
   uri             = "http://${local.api_gateway_target_url}:30564/api/v2/viirs-active-fires"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "viirs_fires_any_v2_viirs_active_fires_proxy" {
@@ -162,4 +167,5 @@ module "viirs_fires_any_v2_viirs_active_fires_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30564/api/v2/viirs-active-fires/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/variables.tf
index 744b794f..6a25d47e 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/viirs-fires/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v2_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/main.tf
index 7d7b4848..ac5e0256 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/main.tf
@@ -94,6 +94,7 @@ module "vocabulary_get_vocabulary" {
   uri             = "http://${local.api_gateway_target_url}:30565/api/v1/vocabulary"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "vocabulary_post_vocabulary" {
@@ -105,6 +106,7 @@ module "vocabulary_post_vocabulary" {
   uri             = "http://${local.api_gateway_target_url}:30565/api/v1/vocabulary"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "vocabulary_any_vocabulary_proxy" {
@@ -116,6 +118,7 @@ module "vocabulary_any_vocabulary_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30565/api/v1/vocabulary/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 #
@@ -223,6 +226,7 @@ module "vocabulary_any_dataset_vocabulary_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30565/api/v1/dataset/vocabulary/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 #
@@ -518,6 +522,7 @@ module "vocabulary_get_favourite" {
   uri             = "http://${local.api_gateway_target_url}:30565/api/v1/favourite"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "vocabulary_post_favourite" {
@@ -529,6 +534,7 @@ module "vocabulary_post_favourite" {
   uri             = "http://${local.api_gateway_target_url}:30565/api/v1/favourite"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "vocabulary_any_favourite_proxy" {
@@ -540,6 +546,7 @@ module "vocabulary_any_favourite_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30565/api/v1/favourite/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 #
@@ -571,6 +578,7 @@ module "vocabulary_get_collection" {
   uri             = "http://${local.api_gateway_target_url}:30565/api/v1/collection"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "vocabulary_any_collection_proxy" {
@@ -582,6 +590,7 @@ module "vocabulary_any_collection_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30565/api/v1/collection/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "vocabulary_post_collection" {
@@ -593,4 +602,5 @@ module "vocabulary_post_collection" {
   uri             = "http://${local.api_gateway_target_url}:30565/api/v1/collection"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/variables.tf
index 2cee4580..b0a83e40 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/vocabulary/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -104,4 +109,4 @@ variable "v1_dataset_id_layer_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/main.tf
index 2265e811..e1a284a7 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/main.tf
@@ -90,6 +90,7 @@ module "webshot_get_v1_webshot" {
   uri             = "http://${local.api_gateway_target_url}:30566/api/v1/webshot"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "webshot_any_v1_webshot_proxy" {
@@ -101,4 +102,5 @@ module "webshot_any_v1_webshot_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30566/api/v1/webshot/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/variables.tf
index ef568472..418be442 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/webshot/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -68,4 +73,4 @@ variable "v1_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/main.tf
index 05cff476..38207831 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/main.tf
@@ -114,6 +114,7 @@ module "widget_get_widget" {
   uri             = "http://${local.api_gateway_target_url}:30567/api/v1/widget"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "widget_post_widget" {
@@ -125,6 +126,7 @@ module "widget_post_widget" {
   uri             = "http://${local.api_gateway_target_url}:30567/api/v1/widget"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "widget_any_widget_proxy" {
@@ -136,6 +138,7 @@ module "widget_any_widget_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30567/api/v1/widget/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
+  require_api_key = var.require_api_key
 }
 
 module "widget_any_dataset_id_widget" {
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/variables.tf
index 437776d1..d89d5f32 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/widget/variables.tf
@@ -47,6 +47,11 @@ variable "vpc_link" {
   default     = { id : null, target_arns : [] }
 }
 
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
+
 variable "connection_type" {
   type        = string
   description = "API Gateway integration type"
@@ -74,4 +79,4 @@ variable "v1_dataset_id_resource" {
   type = object({
     id = string
   })
-}
\ No newline at end of file
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/outputs.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/outputs.tf
index 98a3c593..2f0b1f21 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/outputs.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/outputs.tf
@@ -8,4 +8,8 @@ output "stage_name" {
 
 output "node_group_names" {
   value = data.terraform_remote_state.core.outputs.node_group_names
-}
\ No newline at end of file
+}
+
+output "open_usage_plan_id" {
+  value = aws_api_gateway_usage_plan.open.id
+}
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/variables.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/variables.tf
index bb416c32..aea05bf3 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/variables.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/variables.tf
@@ -60,4 +60,9 @@ variable "tf_core_state_bucket" {
 variable "fw_backend_url" {
   type        = string
   description = "The URL of the backend server to which the request is proxied"
-}
\ No newline at end of file
+}
+
+variable "require_api_key" {
+  type    = bool
+  default = false
+}
diff --git a/terraform-k8s-infrastructure/outputs.tf b/terraform-k8s-infrastructure/outputs.tf
index 29c8285d..13c0b5cf 100644
--- a/terraform-k8s-infrastructure/outputs.tf
+++ b/terraform-k8s-infrastructure/outputs.tf
@@ -4,4 +4,8 @@ output "invoke_url" {
 
 output "node_group_names" {
   value = module.k8s_microservice_routing.node_group_names
-}
\ No newline at end of file
+}
+
+output "api_gateway_open_usage_plan_id" {
+  value = module.k8s_microservice_routing.open_usage_plan_id
+}
diff --git a/terraform-k8s-infrastructure/variables.tf b/terraform-k8s-infrastructure/variables.tf
index 0562fa8c..0b56188c 100644
--- a/terraform-k8s-infrastructure/variables.tf
+++ b/terraform-k8s-infrastructure/variables.tf
@@ -83,3 +83,7 @@ variable "fw_backend_url" {
   type        = string
   description = "The URL of the backend server to which the request is proxied"
 }
+
+variable "require_api_key" {
+  type    = bool
+}
diff --git a/terraform-k8s-infrastructure/vars/terraform-dev.tfvars b/terraform-k8s-infrastructure/vars/terraform-dev.tfvars
index 60ed2f22..1f616b91 100644
--- a/terraform-k8s-infrastructure/vars/terraform-dev.tfvars
+++ b/terraform-k8s-infrastructure/vars/terraform-dev.tfvars
@@ -9,4 +9,5 @@ deploy_metrics_server                    = false
 elasticsearch_data_nodes_type            = "m5.large.elasticsearch"
 x_rw_domain                              = "dev-api.resourcewatch.org"
 namespaces                               = ["core", "aqueduct", "rw", "gfw", "prep", "climate-watch"]
-fw_backend_url                           = "https://dev-fw-api.globalforestwatch.org"
\ No newline at end of file
+fw_backend_url                           = "https://dev-fw-api.globalforestwatch.org"
+require_api_key                          = true
diff --git a/terraform-k8s-infrastructure/vars/terraform-production.tfvars b/terraform-k8s-infrastructure/vars/terraform-production.tfvars
index 405bec17..390e85ca 100644
--- a/terraform-k8s-infrastructure/vars/terraform-production.tfvars
+++ b/terraform-k8s-infrastructure/vars/terraform-production.tfvars
@@ -10,3 +10,4 @@ elasticsearch_data_nodes_type            = "m5.large.elasticsearch"
 x_rw_domain                              = "api.resourcewatch.org"
 namespaces                               = ["core", "aqueduct", "rw", "gfw", "prep", "climate-watch", "gateway"]
 fw_backend_url                           = "https://fw-api.globalforestwatch.org"
+require_api_key                          = false
diff --git a/terraform-k8s-infrastructure/vars/terraform-staging.tfvars b/terraform-k8s-infrastructure/vars/terraform-staging.tfvars
index 2c487d42..b8630dd0 100644
--- a/terraform-k8s-infrastructure/vars/terraform-staging.tfvars
+++ b/terraform-k8s-infrastructure/vars/terraform-staging.tfvars
@@ -9,4 +9,5 @@ deploy_metrics_server                    = false
 elasticsearch_data_nodes_type            = "m5.large.elasticsearch"
 x_rw_domain                              = "staging-api.resourcewatch.org"
 namespaces                               = ["core", "aqueduct", "rw", "gfw", "prep", "climate-watch"]
-fw_backend_url                           = "https://staging-fw-api.globalforestwatch.org"
\ No newline at end of file
+fw_backend_url                           = "https://staging-fw-api.globalforestwatch.org"
+require_api_key                          = false
diff --git a/terraform/main.tf b/terraform/main.tf
index ff07a841..65edf049 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -276,6 +276,10 @@ module "email-templates" {
   sparkpost_api_key = var.sparkpost_api_key
 }
 
+module "cloudwatch-charts" {
+  source = "./modules/cloudwatch-charts"
+}
+
 # module "eks_scaling" {
 #   source                            = "./modules/eks_scaling"
 #   eks_cluster_name                  = module.eks.cluster_name
diff --git a/terraform/modules/cloudwatch-charts/main.tf b/terraform/modules/cloudwatch-charts/main.tf
new file mode 100644
index 00000000..f121568b
--- /dev/null
+++ b/terraform/modules/cloudwatch-charts/main.tf
@@ -0,0 +1,64 @@
+resource "aws_cloudwatch_dashboard" "rw_api_keys_usage" {
+  dashboard_name = "RW_API_Key_usage"
+
+  dashboard_body = jsonencode({
+    "widgets": [
+      {
+        "type": "log",
+        "x": 0,
+        "y": 0,
+        "width": 12,
+        "height": 6,
+        "properties": {
+          "query": "SOURCE 'api-keys-usage' | fields @message\n| filter ispresent(request.method)\n| stats count(*) as requests by request.method, request.path as request_count\n| sort by request_count",
+          "region": "us-east-1",
+          "stacked": false,
+          "title": "Requests per endpoint",
+          "view": "pie"
+        }
+      },
+      {
+        "type": "log",
+        "x": 12,
+        "y": 0,
+        "width": 12,
+        "height": 6,
+        "properties": {
+          "query": "SOURCE 'api-keys-usage' | fields @message\n| filter ispresent(request.method)\n| stats count(*) as requests by @logStream as requests_count\n| sort by requests_count\n",
+          "region": "us-east-1",
+          "stacked": false,
+          "title": "Requests per microservice",
+          "view": "pie"
+        }
+      },
+      {
+        "type": "log",
+        "x": 0,
+        "y": 6,
+        "width": 12,
+        "height": 6,
+        "properties": {
+          "query": "SOURCE 'api-keys-usage' | fields @message\n| stats count(*) as requests by coalesce(requestApplication.name, \"<no application>\") as requests_count\n| sort by requests_count\n",
+          "region": "us-east-1",
+          "stacked": false,
+          "title": "Requests per application",
+          "view": "pie"
+        }
+      },
+      {
+        "type": "log",
+        "x": 12,
+        "y": 6,
+        "width": 12,
+        "height": 6,
+        "properties": {
+          "query": "SOURCE 'api-keys-usage' | fields @message\n| stats count(*) as requests by coalesce(requestApplication.organization.name, \"<no organization>\") as requests_count\n| sort by requests_count\n",
+          "region": "us-east-1",
+          "stacked": false,
+          "title": "Requests per organization",
+          "view": "pie"
+        }
+      }
+    ]
+  })
+}

From 714d11c7181bfa953a487e7b9c7a756e8e7c7e61 Mon Sep 17 00:00:00 2001
From: Tiago Garcia <tiagojsag@gmail.com>
Date: Fri, 4 Aug 2023 17:10:23 +0100
Subject: [PATCH 4/5] Fix authorization MS require_api_key settings

---
 .../microservices/authorization/main.tf        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/main.tf
index 08b99f71..2d8be8ae 100644
--- a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/main.tf
+++ b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/authorization/main.tf
@@ -153,7 +153,7 @@ module "authorization_any_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30505/auth/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  require_api_key = var.require_api_key
+  require_api_key = false
 }
 
 module "authorization_get" {
@@ -165,7 +165,7 @@ module "authorization_get" {
   uri             = "http://${local.api_gateway_target_url}:30505/auth"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  require_api_key = var.require_api_key
+  require_api_key = false
 }
 
 module "authorization_get_v1_deletion" {
@@ -213,7 +213,7 @@ module "authorization_get_v1_organization" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/organization"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  require_api_key = var.require_api_key
+  require_api_key = false
 }
 
 module "authorization_post_v1_organization" {
@@ -225,7 +225,7 @@ module "authorization_post_v1_organization" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/organization"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  require_api_key = var.require_api_key
+  require_api_key = false
 }
 
 module "authorization_any_v1_organization_proxy" {
@@ -237,7 +237,7 @@ module "authorization_any_v1_organization_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/organization/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  require_api_key = var.require_api_key
+  require_api_key = false
 }
 
 module "authorization_get_v1_application" {
@@ -249,7 +249,7 @@ module "authorization_get_v1_application" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/application"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  require_api_key = var.require_api_key
+  require_api_key = false
 }
 
 module "authorization_post_v1_application" {
@@ -261,7 +261,7 @@ module "authorization_post_v1_application" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/application"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  require_api_key = var.require_api_key
+  require_api_key = false
 }
 
 module "authorization_any_v1_application_proxy" {
@@ -273,7 +273,7 @@ module "authorization_any_v1_application_proxy" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/application/{proxy}"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  require_api_key = var.require_api_key
+  require_api_key = false
 }
 
 module "authorization_post_v1_request_validate" {
@@ -285,5 +285,5 @@ module "authorization_post_v1_request_validate" {
   uri             = "http://${local.api_gateway_target_url}:30505/api/v1/request/validate"
   vpc_link        = var.vpc_link
   connection_type = var.connection_type
-  require_api_key = var.require_api_key
+  require_api_key = false
 }

From fa66019b60bb7be0b2265508027166f02f1bb13a Mon Sep 17 00:00:00 2001
From: Tiago Garcia <tiagojsag@gmail.com>
Date: Tue, 17 Oct 2023 07:43:56 +0200
Subject: [PATCH 5/5] Reconsile TF code with actual state on AWS

---
 terraform/main.tf                           |  2 +-
 terraform/modules/aq_bucket/main.tf         |  7 -------
 terraform/modules/cloudwatch-charts/main.tf | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/terraform/main.tf b/terraform/main.tf
index 65edf049..9782a654 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -219,7 +219,7 @@ module "documentdb" {
   enabled_cloudwatch_logs_exports = var.db_logs_exports
   cluster_parameters = [
     {
-      apply_method = "immediate"
+      apply_method = "pending-reboot"
       name         = "profiler"
       value        = "disabled"
     },
diff --git a/terraform/modules/aq_bucket/main.tf b/terraform/modules/aq_bucket/main.tf
index 49902c9c..25be4070 100644
--- a/terraform/modules/aq_bucket/main.tf
+++ b/terraform/modules/aq_bucket/main.tf
@@ -49,13 +49,6 @@ resource "aws_s3_bucket_lifecycle_configuration" "aq_bucket_lifecycle_configurat
   }
 }
 
-resource "aws_s3_object" "object" {
-  bucket       = aws_s3_bucket.aq_bucket.id
-  acl          = "private"
-  key          = "food-supply-chain/"
-  content_type = "application/x-directory"
-}
-
 resource "aws_iam_user" "aq_s3_user" {
   name = "aq_s3_user"
 
diff --git a/terraform/modules/cloudwatch-charts/main.tf b/terraform/modules/cloudwatch-charts/main.tf
index f121568b..98a9fe7c 100644
--- a/terraform/modules/cloudwatch-charts/main.tf
+++ b/terraform/modules/cloudwatch-charts/main.tf
@@ -58,6 +58,20 @@ resource "aws_cloudwatch_dashboard" "rw_api_keys_usage" {
           "title": "Requests per organization",
           "view": "pie"
         }
+      },
+      {
+        "type": "log",
+        "x": 0,
+        "y": 12,
+        "width": 12,
+        "height": 6,
+        "properties": {
+          "query": "SOURCE 'api-keys-usage' | fields @message\n| stats count(*) as requests by coalesce(loggedUser.name, \"<no user>\") as requests_count\n| sort by requests_count",
+          "region": "us-east-1",
+          "stacked": false,
+          "title": "Requests per user",
+          "view": "pie"
+        }
       }
     ]
   })