diff --git a/locals.tf b/locals.tf
index 5ee98cf..10d67eb 100644
--- a/locals.tf
+++ b/locals.tf
@@ -13,7 +13,6 @@ data "aws_grafana_workspace" "this" {
   workspace_id = var.managed_grafana_workspace_id
 }
 
-
 locals {
   eks_oidc_issuer_url  = replace(data.aws_eks_cluster.eks_cluster.identity[0].oidc[0].issuer, "https://", "")
   eks_cluster_endpoint = data.aws_eks_cluster.eks_cluster.endpoint
diff --git a/main.tf b/main.tf
index 1bfbf6b..e64e4c0 100644
--- a/main.tf
+++ b/main.tf
@@ -18,7 +18,6 @@ resource "aws_prometheus_alert_manager_definition" "this" {
 
   workspace_id = local.amp_ws_id
 
-  # TODO: support custom alert manager config
   definition = <<EOF
 alertmanager_config: |
     route:
@@ -64,41 +63,3 @@ resource "grafana_data_source" "amp" {
 resource "grafana_folder" "this" {
   title = "Observability Accelerator Dashboards"
 }
-
-# module "java" {
-#   count  = var.enable_java ? 1 : 0
-#   source = "./modules/workloads/java"
-
-#   addon_context = local.context
-
-#   amp_endpoint = local.amp_ws_endpoint
-#   amp_id       = local.amp_ws_id
-#   amp_region   = local.amp_ws_region
-
-#   enable_recording_rules = var.enable_java_recording_rules
-
-#   dashboards_folder_id = grafana_folder.this.id
-
-#   depends_on = [
-#     module.operator
-#   ]
-# }
-
-# module "infra" {
-#   count  = var.enable_infra_metrics ? 1 : 0
-#   source = "./modules/workloads/kube-prometheus"
-
-#   addon_context = local.context
-
-#   amp_endpoint = local.amp_ws_endpoint
-#   amp_id       = local.amp_ws_id
-#   amp_region   = local.amp_ws_region
-#   config       = var.infra_metrics_config
-
-#   dashboards_folder_id = grafana_folder.this.id
-
-#   depends_on = [
-#     module.operator
-#   ]
-
-# }
diff --git a/modules/workloads/java/main.tf b/modules/workloads/java/main.tf
index 34de9f4..8caefd9 100644
--- a/modules/workloads/java/main.tf
+++ b/modules/workloads/java/main.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     grafana = {
       source  = "grafana/grafana"
-      version = "1.25.0"
+      version = "~> 1.25.0"
     }
   }
 }
@@ -16,7 +16,7 @@ data "aws_partition" "current" {}
 
 # deploys collector
 module "helm_addon" {
-  source = "github.com/aws-observability/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon"
 
 
   helm_config = merge(