diff --git a/.github/workflows/modules-add-to-project.yaml b/.github/workflows/modules-add-to-project.yaml
index fb82d42..00a454d 100644
--- a/.github/workflows/modules-add-to-project.yaml
+++ b/.github/workflows/modules-add-to-project.yaml
@@ -6,7 +6,7 @@
 # changes when modifying this workflow.
 
 name: "add-to-project"
-run-name: Adding this pull request to the project by @${{ github.actor }}
+
 on:
   workflow_call:
     secrets:
@@ -35,4 +35,3 @@ jobs:
         uses: toshimaru/auto-author-assign@v2.1.1
         with:
           repo-token: ${{ secrets.PAT }}
-          author: 'GersonRS'
diff --git a/.github/workflows/modules-linters.yaml b/.github/workflows/modules-linters.yaml
index d5e143e..c87272c 100644
--- a/.github/workflows/modules-linters.yaml
+++ b/.github/workflows/modules-linters.yaml
@@ -7,7 +7,7 @@
 # changes when modifying this workflow.
 
 name: "modules-linters"
-run-name: Checking commits and code by @${{ github.actor }}
+
 on:
   workflow_call:
 
diff --git a/.github/workflows/publish-antora-docs.yaml b/.github/workflows/publish-antora-docs.yaml
index dcf7838..ee98f79 100644
--- a/.github/workflows/publish-antora-docs.yaml
+++ b/.github/workflows/publish-antora-docs.yaml
@@ -1,5 +1,5 @@
 name: Publish to GitHub Pages with Lunr Search Extension
-run-name: Deploy GitHub Pages site by @${{ github.actor }}
+
 on:
   push:
     branches:
diff --git a/examples/kind/main.tf b/examples/kind/main.tf
index 00dc2b0..dcf89ea 100644
--- a/examples/kind/main.tf
+++ b/examples/kind/main.tf
@@ -93,21 +93,6 @@ module "oidc" {
   }
 }
 
-module "postgresql" {
-  source                 = "git::https://github.com/GersonRS/modern-gitops-stack-module-postgresql.git?ref=v2.8.2"
-  cluster_name           = local.cluster_name
-  base_domain            = local.base_domain
-  subdomain              = local.subdomain
-  cluster_issuer         = local.cluster_issuer
-  argocd_project         = local.cluster_name
-  app_autosync           = local.app_autosync
-  enable_service_monitor = local.enable_service_monitor
-
-  dependency_ids = {
-    argocd = module.argocd_bootstrap.id
-  }
-}
-
 module "minio" {
   source = "git::https://github.com/GersonRS/modern-gitops-stack-module-minio.git?ref=v2.6.2"
 
@@ -128,35 +113,35 @@ module "minio" {
   }
 }
 
-module "mlflow" {
-  source                 = "git::https://github.com/GersonRS/modern-gitops-stack-module-mlflow.git?ref=v1.2.1"
-  cluster_name           = local.cluster_name
-  base_domain            = local.base_domain
-  subdomain              = local.subdomain
-  cluster_issuer         = local.cluster_issuer
-  argocd_project         = local.cluster_name
-  app_autosync           = local.app_autosync
-  enable_service_monitor = local.enable_service_monitor
+# module "mlflow" {
+#   source                 = "git::https://github.com/GersonRS/modern-gitops-stack-module-mlflow.git?ref=v1.2.1"
+#   cluster_name           = local.cluster_name
+#   base_domain            = local.base_domain
+#   subdomain              = local.subdomain
+#   cluster_issuer         = local.cluster_issuer
+#   argocd_project         = local.cluster_name
+#   app_autosync           = local.app_autosync
+#   enable_service_monitor = local.enable_service_monitor
 
-  storage = {
-    bucket_name       = "mlflow"
-    endpoint          = module.minio.endpoint
-    access_key        = module.minio.minio_root_user_credentials.username
-    secret_access_key = module.minio.minio_root_user_credentials.password
-  }
-  database = {
-    user     = module.postgresql.credentials.user
-    password = module.postgresql.credentials.password
-    database = "mlflow"
-    service  = module.postgresql.cluster_dns
-  }
-  dependency_ids = {
-    argocd     = module.argocd_bootstrap.id
-    traefik    = module.traefik.id
-    minio      = module.minio.id
-    postgresql = module.postgresql.id
-  }
-}
+#   storage = {
+#     bucket_name       = "mlflow"
+#     endpoint          = module.minio.endpoint
+#     access_key        = module.minio.minio_root_user_credentials.username
+#     secret_access_key = module.minio.minio_root_user_credentials.password
+#   }
+#   database = {
+#     user     = module.postgresql.credentials.user
+#     password = module.postgresql.credentials.password
+#     database = "mlflow"
+#     service  = module.postgresql.cluster_dns
+#   }
+#   dependency_ids = {
+#     argocd     = module.argocd_bootstrap.id
+#     traefik    = module.traefik.id
+#     minio      = module.minio.id
+#     postgresql = module.postgresql.id
+#   }
+# }
 
 # module "strimzi" {
 #   source                 = "git::https://github.com/GersonRS/modern-gitops-stack-module-strimzi.git?ref=v1.4.3"
@@ -393,26 +378,78 @@ module "kube-prometheus-stack" {
   }
 }
 
-# module "spark" {
-#   source = "git::https://github.com/GersonRS/modern-gitops-stack-module-spark.git?ref=v1.5.1"
+module "spark" {
+  source = "git::https://github.com/GersonRS/modern-gitops-stack-module-spark.git?ref=v1.5.1"
 
-#   cluster_name           = local.cluster_name
-#   base_domain            = local.base_domain
-#   subdomain              = local.subdomain
-#   cluster_issuer         = local.cluster_issuer
-#   argocd_project         = local.cluster_name
-#   app_autosync           = local.app_autosync
-#   enable_service_monitor = local.enable_service_monitor
+  cluster_name           = local.cluster_name
+  base_domain            = local.base_domain
+  subdomain              = local.subdomain
+  cluster_issuer         = local.cluster_issuer
+  argocd_project         = local.cluster_name
+  app_autosync           = local.app_autosync
+  enable_service_monitor = local.enable_service_monitor
 
-#   storage = {
-#     access_key        = module.minio.minio_root_user_credentials.username
-#     secret_access_key = module.minio.minio_root_user_credentials.password
-#   }
+  storage = {
+    access_key        = module.minio.minio_root_user_credentials.username
+    secret_access_key = module.minio.minio_root_user_credentials.password
+  }
 
-#   dependency_ids = {
-#     cert-manager = module.cert-manager.id
-#   }
-# }
+  dependency_ids = {
+    argocd       = module.argocd_bootstrap.id
+    traefik      = module.traefik.id
+    cert-manager = module.cert-manager.id
+    minio        = module.minio.id
+  }
+}
+
+module "postgresql" {
+  source                 = "git::https://github.com/GersonRS/modern-gitops-stack-module-postgresql.git?ref=v2.10.0"
+  cluster_name           = local.cluster_name
+  base_domain            = local.base_domain
+  subdomain              = local.subdomain
+  cluster_issuer         = local.cluster_issuer
+  argocd_project         = local.cluster_name
+  app_autosync           = local.app_autosync
+  enable_service_monitor = local.enable_service_monitor
+
+  dependency_ids = {
+    argocd = module.argocd_bootstrap.id
+  }
+}
+
+module "hive-metastore" {
+  source = "git::https://github.com/GersonRS/modern-gitops-stack-module-hive-metastore.git?ref=v1.2.0"
+
+  cluster_name           = local.cluster_name
+  base_domain            = local.base_domain
+  subdomain              = local.subdomain
+  cluster_issuer         = local.cluster_issuer
+  argocd_project         = local.cluster_name
+  app_autosync           = local.app_autosync
+  enable_service_monitor = local.enable_service_monitor
+
+  storage = {
+    bucket_name       = "warehouse"
+    endpoint          = module.minio.endpoint
+    access_key        = module.minio.minio_root_user_credentials.username
+    secret_access_key = module.minio.minio_root_user_credentials.password
+  }
+  database = {
+    user     = module.postgresql.credentials.user
+    password = module.postgresql.credentials.password
+    database = "metastore"
+    service  = module.postgresql.cluster_dns
+  }
+
+  dependency_ids = {
+    argocd       = module.argocd_bootstrap.id
+    traefik      = module.traefik.id
+    cert-manager = module.cert-manager.id
+    minio        = module.minio.id
+    postgresql   = module.postgresql.id
+    spark        = module.spark.id
+  }
+}
 
 # module "airflow" {
 #   source                 = "git::https://github.com/GersonRS/modern-gitops-stack-module-airflow.git?ref=v1.6.2"
diff --git a/examples/kind/s3_buckets.tf b/examples/kind/s3_buckets.tf
index 8b87c45..302ce52 100644
--- a/examples/kind/s3_buckets.tf
+++ b/examples/kind/s3_buckets.tf
@@ -190,6 +190,9 @@ locals {
       {
         name = "curated"
       },
+      {
+        name = "warehouse"
+      },
       {
         name = "bronze"
       },