diff --git a/contexts/aws-example/blueprint.yaml b/contexts/aws-example/blueprint.yaml
index cdda6557d..b1b24832d 100644
--- a/contexts/aws-example/blueprint.yaml
+++ b/contexts/aws-example/blueprint.yaml
@@ -43,8 +43,8 @@ kustomize:
   source: core
   dependsOn:
   - policy-base
-- name: ingress-base
-  path: ingress/base
+- name: ingress
+  path: ingress
   source: core
   dependsOn:
   - pki-resources
@@ -83,7 +83,7 @@ kustomize:
   path: observability
   source: core
   dependsOn:
-  - ingress-base
+  - ingress
   components:
   - grafana
   - grafana/ingress
diff --git a/contexts/azure-example/blueprint.yaml b/contexts/azure-example/blueprint.yaml
index 52e515f03..925240961 100644
--- a/contexts/azure-example/blueprint.yaml
+++ b/contexts/azure-example/blueprint.yaml
@@ -61,8 +61,8 @@ kustomize:
   components:
   - private-issuer/ca
   - public-issuer/selfsigned
-- name: ingress-base
-  path: ingress/base
+- name: ingress
+  path: ingress
   source: core
   dependsOn:
   - pki-resources
@@ -75,7 +75,7 @@ kustomize:
   path: gitops/flux
   source: core
   dependsOn:
-  - ingress-base
+  - ingress
   force: true
   components:
   - webhook
@@ -83,7 +83,7 @@ kustomize:
   path: observability
   source: core
   dependsOn:
-  - ingress-base
+  - ingress
   components:
   - grafana
   - grafana/ingress
diff --git a/contexts/local/blueprint.yaml b/contexts/local/blueprint.yaml
index 55c8f82c4..415c588cb 100644
--- a/contexts/local/blueprint.yaml
+++ b/contexts/local/blueprint.yaml
@@ -46,8 +46,8 @@ kustomize:
   components:
   - openebs
   - openebs/dynamic-localpv
-- name: ingress-base
-  path: ingress/base
+- name: ingress
+  path: ingress
   dependsOn:
   - pki-resources
   components:
@@ -84,6 +84,6 @@ kustomize:
 - name: gitops
   path: gitops/flux
   dependsOn:
-  - ingress-base
+  - ingress
   components:
   - webhook
diff --git a/kustomize/ingress/base/kustomization.yaml b/kustomize/ingress/kustomization.yaml
similarity index 100%
rename from kustomize/ingress/base/kustomization.yaml
rename to kustomize/ingress/kustomization.yaml
diff --git a/kustomize/ingress/base/namespace.yaml b/kustomize/ingress/namespace.yaml
similarity index 100%
rename from kustomize/ingress/base/namespace.yaml
rename to kustomize/ingress/namespace.yaml
diff --git a/kustomize/ingress/base/nginx/coredns/kustomization.yaml b/kustomize/ingress/nginx/coredns/kustomization.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/coredns/kustomization.yaml
rename to kustomize/ingress/nginx/coredns/kustomization.yaml
diff --git a/kustomize/ingress/base/nginx/coredns/patches/helm-release.yaml b/kustomize/ingress/nginx/coredns/patches/helm-release.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/coredns/patches/helm-release.yaml
rename to kustomize/ingress/nginx/coredns/patches/helm-release.yaml
diff --git a/kustomize/ingress/base/nginx/flux-webhook/kustomization.yaml b/kustomize/ingress/nginx/flux-webhook/kustomization.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/flux-webhook/kustomization.yaml
rename to kustomize/ingress/nginx/flux-webhook/kustomization.yaml
diff --git a/kustomize/ingress/base/nginx/flux-webhook/patches/helm-release.yaml b/kustomize/ingress/nginx/flux-webhook/patches/helm-release.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/flux-webhook/patches/helm-release.yaml
rename to kustomize/ingress/nginx/flux-webhook/patches/helm-release.yaml
diff --git a/kustomize/ingress/base/nginx/helm-release.yaml b/kustomize/ingress/nginx/helm-release.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/helm-release.yaml
rename to kustomize/ingress/nginx/helm-release.yaml
diff --git a/kustomize/ingress/base/nginx/helm-repository.yaml b/kustomize/ingress/nginx/helm-repository.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/helm-repository.yaml
rename to kustomize/ingress/nginx/helm-repository.yaml
diff --git a/kustomize/ingress/base/nginx/kustomization.yaml b/kustomize/ingress/nginx/kustomization.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/kustomization.yaml
rename to kustomize/ingress/nginx/kustomization.yaml
diff --git a/kustomize/ingress/base/nginx/loadbalancer/kustomization.yaml b/kustomize/ingress/nginx/loadbalancer/kustomization.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/loadbalancer/kustomization.yaml
rename to kustomize/ingress/nginx/loadbalancer/kustomization.yaml
diff --git a/kustomize/ingress/base/nginx/loadbalancer/patches/helm-release.yaml b/kustomize/ingress/nginx/loadbalancer/patches/helm-release.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/loadbalancer/patches/helm-release.yaml
rename to kustomize/ingress/nginx/loadbalancer/patches/helm-release.yaml
diff --git a/kustomize/ingress/base/nginx/nodeport/kustomization.yaml b/kustomize/ingress/nginx/nodeport/kustomization.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/nodeport/kustomization.yaml
rename to kustomize/ingress/nginx/nodeport/kustomization.yaml
diff --git a/kustomize/ingress/base/nginx/nodeport/patches/helm-release.yaml b/kustomize/ingress/nginx/nodeport/patches/helm-release.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/nodeport/patches/helm-release.yaml
rename to kustomize/ingress/nginx/nodeport/patches/helm-release.yaml
diff --git a/kustomize/ingress/base/nginx/web/kustomization.yaml b/kustomize/ingress/nginx/web/kustomization.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/web/kustomization.yaml
rename to kustomize/ingress/nginx/web/kustomization.yaml
diff --git a/kustomize/ingress/base/nginx/web/patches/helm-release.yaml b/kustomize/ingress/nginx/web/patches/helm-release.yaml
similarity index 100%
rename from kustomize/ingress/base/nginx/web/patches/helm-release.yaml
rename to kustomize/ingress/nginx/web/patches/helm-release.yaml
diff --git a/terraform/backend/azurerm/README.md b/terraform/backend/azurerm/README.md
index b870ee8b8..2f05a6c3e 100644
--- a/terraform/backend/azurerm/README.md
+++ b/terraform/backend/azurerm/README.md
@@ -3,13 +3,13 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 4.29.0 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 4.30.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.29.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.30.0 |
 | <a name="provider_local"></a> [local](#provider\_local) | 2.5.3 |
 
 ## Modules
@@ -20,10 +20,10 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [azurerm_resource_group.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.29.0/docs/resources/resource_group) | resource |
-| [azurerm_storage_account.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.29.0/docs/resources/storage_account) | resource |
-| [azurerm_storage_container.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.29.0/docs/resources/storage_container) | resource |
-| [azurerm_user_assigned_identity.storage](https://registry.terraform.io/providers/hashicorp/azurerm/4.29.0/docs/resources/user_assigned_identity) | resource |
+| [azurerm_resource_group.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.30.0/docs/resources/resource_group) | resource |
+| [azurerm_storage_account.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.30.0/docs/resources/storage_account) | resource |
+| [azurerm_storage_container.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.30.0/docs/resources/storage_container) | resource |
+| [azurerm_user_assigned_identity.storage](https://registry.terraform.io/providers/hashicorp/azurerm/4.30.0/docs/resources/user_assigned_identity) | resource |
 | [local_file.backend_config](https://registry.terraform.io/providers/hashicorp/local/latest/docs/resources/file) | resource |
 
 ## Inputs
diff --git a/terraform/cluster/azure-aks/README.md b/terraform/cluster/azure-aks/README.md
index 64ae510b9..59fa26c7d 100644
--- a/terraform/cluster/azure-aks/README.md
+++ b/terraform/cluster/azure-aks/README.md
@@ -25,13 +25,13 @@ This module requires a paid Azure subscription. Free tier subscriptions are not
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=1.8 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 4.29.0 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 4.30.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.29.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.30.0 |
 | <a name="provider_local"></a> [local](#provider\_local) | 2.5.3 |
 | <a name="provider_random"></a> [random](#provider\_random) | 3.7.2 |
 | <a name="provider_time"></a> [time](#provider\_time) | 0.13.1 |
diff --git a/terraform/gitops/flux/README.md b/terraform/gitops/flux/README.md
index 575cdbe11..f3fd517e8 100644
--- a/terraform/gitops/flux/README.md
+++ b/terraform/gitops/flux/README.md
@@ -4,14 +4,14 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=1.7.3 |
-| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | 2.36.0 |
+| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | 2.37.1 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_helm"></a> [helm](#provider\_helm) | 2.17.0 |
-| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.36.0 |
+| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.37.1 |
 
 ## Modules
 
@@ -22,9 +22,9 @@ No modules.
 | Name | Type |
 |------|------|
 | [helm_release.flux_system](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
-| [kubernetes_namespace.flux_system](https://registry.terraform.io/providers/hashicorp/kubernetes/2.36.0/docs/resources/namespace) | resource |
-| [kubernetes_secret.git_auth](https://registry.terraform.io/providers/hashicorp/kubernetes/2.36.0/docs/resources/secret) | resource |
-| [kubernetes_secret.webhook_token](https://registry.terraform.io/providers/hashicorp/kubernetes/2.36.0/docs/resources/secret) | resource |
+| [kubernetes_namespace.flux_system](https://registry.terraform.io/providers/hashicorp/kubernetes/2.37.1/docs/resources/namespace) | resource |
+| [kubernetes_secret.git_auth](https://registry.terraform.io/providers/hashicorp/kubernetes/2.37.1/docs/resources/secret) | resource |
+| [kubernetes_secret.webhook_token](https://registry.terraform.io/providers/hashicorp/kubernetes/2.37.1/docs/resources/secret) | resource |
 
 ## Inputs
 
diff --git a/terraform/network/aws-vpc/main.tf b/terraform/network/aws-vpc/main.tf
index fe41ebd25..1e7c78e7c 100644
--- a/terraform/network/aws-vpc/main.tf
+++ b/terraform/network/aws-vpc/main.tf
@@ -309,3 +309,5 @@ resource "aws_route53_zone" "main" {
     vpc_id = aws_vpc.main.id
   }
 }
+
+# Trigger CI checks
diff --git a/terraform/network/azure-vnet/README.md b/terraform/network/azure-vnet/README.md
index d6280cfc7..d58251438 100644
--- a/terraform/network/azure-vnet/README.md
+++ b/terraform/network/azure-vnet/README.md
@@ -4,13 +4,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=1.8 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 4.29.0 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 4.30.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.29.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.30.0 |
 
 ## Modules