diff --git a/README.md b/README.md
index 2bbe133..ff260ca 100644
--- a/README.md
+++ b/README.md
@@ -71,14 +71,9 @@ Welcome to AWS Observability Accelerator for Terraform!
 | <a name="input_enable_alertmanager"></a> [enable\_alertmanager](#input\_enable\_alertmanager) | Create AMP AlertManager for all workloads | `bool` | `false` | no |
 | <a name="input_enable_amazon_eks_adot"></a> [enable\_amazon\_eks\_adot](#input\_enable\_amazon\_eks\_adot) | n/a | `bool` | `true` | no |
 | <a name="input_enable_cert_manager"></a> [enable\_cert\_manager](#input\_enable\_cert\_manager) | Allow reusing an existing installation of cert-manager | `bool` | `true` | no |
-| <a name="input_enable_infra_metrics"></a> [enable\_infra\_metrics](#input\_enable\_infra\_metrics) | n/a | `bool` | `false` | no |
-| <a name="input_enable_java"></a> [enable\_java](#input\_enable\_java) | Deploys a collector for JAVA/JMX based workloads, dashboards and alerting rules | `bool` | `false` | no |
-| <a name="input_enable_java_recording_rules"></a> [enable\_java\_recording\_rules](#input\_enable\_java\_recording\_rules) | Enable AMP recording rules for Java | `bool` | `true` | no |
 | <a name="input_enable_managed_grafana"></a> [enable\_managed\_grafana](#input\_enable\_managed\_grafana) | n/a | `bool` | `true` | no |
 | <a name="input_enable_managed_prometheus"></a> [enable\_managed\_prometheus](#input\_enable\_managed\_prometheus) | n/a | `bool` | `true` | no |
-| <a name="input_enable_opentelemetry_operator"></a> [enable\_opentelemetry\_operator](#input\_enable\_opentelemetry\_operator) | n/a | `bool` | `false` | no |
 | <a name="input_grafana_api_key"></a> [grafana\_api\_key](#input\_grafana\_api\_key) | n/a | `string` | `null` | no |
-| <a name="input_infra_metrics_config"></a> [infra\_metrics\_config](#input\_infra\_metrics\_config) | n/a | <pre>object({<br>    helm_config = map(any)<br><br>    enable_kube_state_metrics = bool<br>    kms_create_namespace      = bool<br>    ksm_k8s_namespace         = string<br>    ksm_helm_chart_name       = string<br>    ksm_helm_chart_version    = string<br>    ksm_helm_release_name     = string<br>    ksm_helm_repo_url         = string<br>    ksm_helm_settings         = map(string)<br>    ksm_helm_values           = map(any)<br><br>    enable_node_exporter  = bool<br>    ne_create_namespace   = bool<br>    ne_k8s_namespace      = string<br>    ne_helm_chart_name    = string<br>    ne_helm_chart_version = string<br>    ne_helm_release_name  = string<br>    ne_helm_repo_url      = string<br>    ne_helm_settings      = map(string)<br>    ne_helm_values        = map(any)<br><br>    enable_dashboards = bool<br>  })</pre> | `null` | no |
 | <a name="input_irsa_iam_permissions_boundary"></a> [irsa\_iam\_permissions\_boundary](#input\_irsa\_iam\_permissions\_boundary) | IAM permissions boundary for IRSA roles | `string` | `""` | no |
 | <a name="input_irsa_iam_role_path"></a> [irsa\_iam\_role\_path](#input\_irsa\_iam\_role\_path) | IAM role path for IRSA roles | `string` | `"/"` | no |
 | <a name="input_managed_grafana_region"></a> [managed\_grafana\_region](#input\_managed\_grafana\_region) | AWS Managed Grafana Workspace Region | `string` | `null` | no |
diff --git a/examples/existing-cluster-with-base-and-infra/README.md b/examples/existing-cluster-with-base-and-infra/README.md
index 06d064b..2874beb 100644
--- a/examples/existing-cluster-with-base-and-infra/README.md
+++ b/examples/existing-cluster-with-base-and-infra/README.md
@@ -20,7 +20,7 @@
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_eks_observability_accelerator"></a> [eks\_observability\_accelerator](#module\_eks\_observability\_accelerator) | ../../ | n/a |
-| <a name="module_workloads_infra"></a> [workloads\_infra](#module\_workloads\_infra) | ../../workloads/infra | n/a |
+| <a name="module_workloads_infra"></a> [workloads\_infra](#module\_workloads\_infra) | ../../modules/workloads/infra | n/a |
 
 ## Resources
 
@@ -37,7 +37,6 @@
 | <a name="input_eks_cluster_id"></a> [eks\_cluster\_id](#input\_eks\_cluster\_id) | EKS Cluster Id | `string` | n/a | yes |
 | <a name="input_grafana_api_key"></a> [grafana\_api\_key](#input\_grafana\_api\_key) | API key for authorizing the Grafana provider to make changes to Amazon Managed Grafana | `string` | `""` | no |
 | <a name="input_grafana_endpoint"></a> [grafana\_endpoint](#input\_grafana\_endpoint) | Grafana endpoint | `string` | `null` | no |
-| <a name="input_java"></a> [java](#input\_java) | n/a | `map` | <pre>{<br>  "a": "",<br>  "b": ""<br>}</pre> | no |
 | <a name="input_managed_grafana_workspace_id"></a> [managed\_grafana\_workspace\_id](#input\_managed\_grafana\_workspace\_id) | n/a | `string` | `""` | no |
 | <a name="input_managed_prometheus_endpoint"></a> [managed\_prometheus\_endpoint](#input\_managed\_prometheus\_endpoint) | n/a | `string` | `""` | no |
 | <a name="input_managed_prometheus_region"></a> [managed\_prometheus\_region](#input\_managed\_prometheus\_region) | n/a | `string` | `""` | no |
diff --git a/variables.tf b/variables.tf
index cefa095..f8d071f 100644
--- a/variables.tf
+++ b/variables.tf
@@ -31,11 +31,6 @@ variable "enable_cert_manager" {
   default     = true
 }
 
-variable "enable_opentelemetry_operator" {
-  type    = bool
-  default = false
-}
-
 variable "enable_managed_prometheus" {
   type    = bool
   default = true
@@ -64,7 +59,6 @@ variable "enable_managed_grafana" {
   default = true
 }
 
-
 variable "managed_grafana_region" {
   description = "AWS Managed Grafana Workspace Region"
   type        = string
@@ -79,64 +73,8 @@ variable "grafana_api_key" {
   default = null
 }
 
-variable "enable_java" {
-  description = "Deploys a collector for JAVA/JMX based workloads, dashboards and alerting rules"
-  type        = bool
-  default     = false
-}
-
-variable "enable_java_recording_rules" {
-  description = "Enable AMP recording rules for Java"
-  type        = bool
-  default     = true
-}
-
-# variable "java_config" {
-#   description = "Input configuration Java workloads"
-#   type = object({
-#     enable_recording_rules = bool
-#   })
-# }
-
-
 variable "tags" {
   description = "Additional tags (e.g. `map('BusinessUnit`,`XYZ`)"
   type        = map(string)
   default     = {}
 }
-
-
-variable "enable_infra_metrics" {
-  type    = bool
-  default = false
-}
-
-variable "infra_metrics_config" {
-  type = object({
-    helm_config = map(any)
-
-    enable_kube_state_metrics = bool
-    kms_create_namespace      = bool
-    ksm_k8s_namespace         = string
-    ksm_helm_chart_name       = string
-    ksm_helm_chart_version    = string
-    ksm_helm_release_name     = string
-    ksm_helm_repo_url         = string
-    ksm_helm_settings         = map(string)
-    ksm_helm_values           = map(any)
-
-    enable_node_exporter  = bool
-    ne_create_namespace   = bool
-    ne_k8s_namespace      = string
-    ne_helm_chart_name    = string
-    ne_helm_chart_version = string
-    ne_helm_release_name  = string
-    ne_helm_repo_url      = string
-    ne_helm_settings      = map(string)
-    ne_helm_values        = map(any)
-
-    enable_dashboards = bool
-  })
-
-  default = null
-}