diff --git a/main.tf b/main.tf
index 8d9a6924..f8c25ad1 100644
--- a/main.tf
+++ b/main.tf
@@ -271,6 +271,17 @@ module "iam_role" {
   aws_iam_openid_connect_provider_url = module.app_eks.aws_iam_openid_connect_provider
 }
 
+# locals {
+#   chart_version_parts = split(".", var.wandb_operator_chart_version)
+#   major               = tonumber(local.chart_version_parts[0])
+#   minor               = tonumber(local.chart_version_parts[1])
+
+#   chart_version_is_newer = (
+#     local.major > 0 ||
+#     (local.major == 0 && local.minor > 32)
+#   )
+# }
+
 locals {
   weave_trace_sa_name  = "wandb-weave-trace"
   ctrlplane_redis_host = "redis.redis.svc.cluster.local"
@@ -280,6 +291,11 @@ locals {
   }
 
   spec = {
+    chart = {
+      url     = var.wandb_operator_chart_repository
+      name    = var.wandb_operator_chart_name
+      version = var.wandb_operator_chart_version
+    }
     values = {
       global = {
         size          = var.size
@@ -288,6 +304,18 @@ locals {
         cloudProvider = "aws"
         extraEnv      = var.other_wandb_env
 
+        api = {
+          enabled = true
+        }
+
+        glue = {
+          enabled = true
+        }
+
+        executor = {
+          enabled = true
+        }
+
         bucket = var.bucket_name != "" ? {
           provider = "s3"
           name     = var.bucket_name
@@ -376,12 +404,20 @@ locals {
             "issuer"  = "https://${module.app_eks.aws_iam_openid_connect_provider}"
           }
         ]
+        image = {
+          repository = var.wandb_local_image_repository
+          tag        = var.wandb_local_image_tag
+        }
       }
 
       console = {
         extraEnv = {
           "BUCKET_ACCESS_IDENTITY" = module.app_eks.node_role.arn
         }
+        image = {
+          repository = var.wandb_console_image_repository
+          tag        = var.wandb_console_image_tag
+        }
       }
 
       # To support otel rds and redis metrics, we need operator-wandb chart min version 0.13.8 (yace subchart)
@@ -410,11 +446,82 @@ locals {
           }
         }
         extraEnv = var.weave_wandb_env
+        image = {
+          # After chart operator-wandb 0.32.9 replace with wandb/weave-python
+          # repository: wandb/weave-python
+          # repository = local.chart_version_is_newer ? var.wandb_weave_python_image_repository : var.wandb_local_image_repository
+          repository = var.wandb_weave_python_image_repository
+          tag        = var.wandb_weave_python_image_tag
+        }
       }
 
       parquet = {
         extraEnv = var.parquet_wandb_env
+        image = {
+          # After chart operator-wandb 0.32.9 replace with wandb/megabinary
+          # repository: wandb/megabinary
+          # repository = local.chart_version_is_newer ? var.wandb_megabinary_image_repository : var.wandb_local_image_repository
+          repository = var.wandb_megabinary_image_repository
+          tag        = var.wandb_local_image_tag
+        }
       }
+
+      settingsMigrationJob = {
+        image = {
+          # repository = local.chart_version_is_newer ? var.wandb_megabinary_image_repository : var.wandb_local_image_repository
+          repository = var.wandb_megabinary_image_repository
+          tag        = var.wandb_megabinary_image_tag
+        }
+      }
+
+      api = {
+        install = true
+        image = {
+          # repository = local.chart_version_is_newer ? var.wandb_megabinary_image_repository : var.wandb_local_image_repository
+          repository = var.wandb_megabinary_image_repository
+          tag        = var.wandb_megabinary_image_tag
+        }
+      }
+
+      glue = {
+        install = true
+        # After chart operator-wandb 0.32.9 replace with wandb/megabinary
+        # repository: wandb/megabinary
+        image = {
+          # repository = local.chart_version_is_newer ? var.wandb_megabinary_image_repository : var.wandb_local_image_repository
+          repository = var.wandb_megabinary_image_repository
+          tag        = var.wandb_megabinary_image_tag
+        }
+      }
+
+      executor = {
+        install = true
+        # After chart operator-wandb 0.32.9 replace with wandb/megabinary
+        # repository: wandb/megabinary
+        image = {
+          # repository = local.chart_version_is_newer ? var.wandb_megabinary_image_repository : var.wandb_local_image_repository
+          repository = var.wandb_megabinary_image_repository
+          tag        = var.wandb_megabinary_image_tag
+        }
+      }
+
+      appRenamePreHook = {
+        image = {
+          repository = var.helm_hooks_image_repository
+          tag        = var.helm_hook_image_tag
+        }
+      }
+
+      appRenamePostHook = {
+        image = {
+          repository = var.helm_hooks_image_repository
+          tag        = var.helm_hook_image_tag
+        }
+      }
+
+      prometheus = { install = var.enable_wandb_prometheus }
+      otel       = { install = var.enable_wandb_otel }
+
     }
   }
 }
@@ -428,7 +535,7 @@ resource "time_sleep" "wait_for_deletion_reconcile" {
 
 module "wandb" {
   source  = "wandb/wandb/helm"
-  version = "3.0.0"
+  version = "4.0.0"
 
   depends_on = [
     module.database,
@@ -438,10 +545,11 @@ module "wandb" {
     time_sleep.wait_for_deletion_reconcile
   ]
 
-  operator_chart_version = var.operator_chart_version
-  controller_image_tag   = var.controller_image_tag
-  enable_helm_operator   = var.enable_helm_operator
-  enable_helm_wandb      = var.enable_helm_wandb
+  operator_chart_version      = var.operator_chart_version
+  controller_image_repository = var.controller_image_repository
+  controller_image_tag        = var.controller_image_tag
+  enable_helm_operator        = var.enable_helm_operator
+  enable_helm_wandb           = var.enable_helm_wandb
 
   spec = local.spec
 }
diff --git a/variables.tf b/variables.tf
index 013c730b..c121adff 100644
--- a/variables.tf
+++ b/variables.tf
@@ -32,6 +32,12 @@ variable "operator_chart_version" {
   default     = "1.4.2"
 }
 
+variable "controller_image_repository" {
+  type        = string
+  description = "wandb/controller image repository"
+  default     = "wandb/controller"
+}
+
 variable "controller_image_tag" {
   type        = string
   description = "Tag of the controller image to deploy"
@@ -657,3 +663,94 @@ variable "cluster_autoscaler_image_tag" {
   description = "The tag of the cluster-autoscaler to deploy."
   default     = null
 }
+
+variable "wandb_local_image_repository" {
+  type        = string
+  description = "wandb/local image repository"
+  default     = "wandb/local"
+}
+
+variable "wandb_local_image_tag" {
+  type        = string
+  description = "wandb/local image tag"
+  default     = null
+}
+
+variable "wandb_console_image_repository" {
+  type        = string
+  description = "wandb/console image repository"
+  default     = "wandb/console"
+}
+
+variable "wandb_console_image_tag" {
+  type        = string
+  description = "wandb/console image tag"
+  default     = null
+}
+
+variable "wandb_megabinary_image_repository" {
+  type        = string
+  description = "wandb/megabinary image repository"
+  default     = "wandb/megabinary"
+}
+
+variable "wandb_megabinary_image_tag" {
+  type        = string
+  description = "wandb/megabinary image tag"
+  default     = null
+}
+
+variable "wandb_operator_chart_repository" {
+  type        = string
+  description = "wandb/operator chart repository"
+  default     = "https://charts.wandb.ai"
+}
+
+variable "wandb_operator_chart_version" {
+  type        = string
+  description = "wandb/operator chart version"
+  default     = null
+}
+
+variable "wandb_operator_chart_name" {
+  type        = string
+  description = "wandb/operator chart name"
+  default     = "operator-wandb"
+}
+
+variable "wandb_weave_python_image_repository" {
+  type        = string
+  description = "wandb/weave-python image repository"
+  default     = "wandb/weave-python"
+}
+
+variable "wandb_weave_python_image_tag" {
+  type        = string
+  description = "wandb/weave-python image tag"
+  default     = null
+}
+
+variable "helm_hooks_image_repository" {
+  type        = string
+  description = "Helm Chart pre and post hook's image"
+  default     = "alpine/k8s"
+}
+
+variable "helm_hook_image_tag" {
+  type        = string
+  description = "Helm Chart pre and post hook's image tag"
+  default     = null
+}
+
+variable "enable_wandb_prometheus" {
+  type        = bool
+  description = "Enable or disable deploying prometheus resources"
+  default     = null
+}
+
+variable "enable_wandb_otel" {
+  type        = bool
+  description = "Enable or disable deploying otel resources"
+  default     = null
+}
+