diff --git a/infra/Makefile b/infra/Makefile
index 8af1eb61..8e7b4b47 100644
--- a/infra/Makefile
+++ b/infra/Makefile
@@ -3,13 +3,10 @@
 default: init apply
 
 init:
-	cd platform \
-	&& terraform init
+	terraform init
 
 plan:
-	platform \
-	&& terraform plan
+	terraform plan
 
 apply:
-	cd platform \
-	&& terraform apply
+	terraform apply
diff --git a/infra/base/container_registry.tf b/infra/base/container_registry.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/infra/base/main.tf b/infra/base/main.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/infra/platform/bootstrap.tf b/infra/bootstrap.tf
similarity index 60%
rename from infra/platform/bootstrap.tf
rename to infra/bootstrap.tf
index 86059ed3..f35bd070 100644
--- a/infra/platform/bootstrap.tf
+++ b/infra/bootstrap.tf
@@ -1,4 +1,4 @@
 module "rke_cluster_bootstrap" {
-  source      = "../modules/kubernetes-cluster-bootstrap"
+  source      = "./modules/kubernetes-cluster-bootstrap"
   kube_config = rke_cluster.cluster.kube_config_yaml
 }
diff --git a/infra/platform/cluster.tf b/infra/cluster.tf
similarity index 100%
rename from infra/platform/cluster.tf
rename to infra/cluster.tf
diff --git a/infra/modules/kubernetes-cluster-bootstrap/main.tf b/infra/modules/kubernetes-cluster-bootstrap/main.tf
index 51ccdcee..9da009d2 100644
--- a/infra/modules/kubernetes-cluster-bootstrap/main.tf
+++ b/infra/modules/kubernetes-cluster-bootstrap/main.tf
@@ -70,7 +70,7 @@ resource "helm_release" "longhorn" {
 resource "helm_release" "argocd" {
   name       = "argocd"
   repository = "https://argoproj.github.io/argo-helm"
-  chart      = "argocd"
+  chart      = "argo-cd"
   version    = "3.1.2"
 
   namespace        = "argocd"
@@ -78,18 +78,18 @@ resource "helm_release" "argocd" {
 }
 
 # TODO move Vault out of bootstrap
-resource "helm_release" "vault" {
-  name       = "vault"
-  repository = "https://helm.releases.hashicorp.com"
-  chart      = "vault"
-  # TODO upgrade vault helm version
-  version    = "0.8.0"
+# resource "helm_release" "vault" {
+#   name       = "vault"
+#   repository = "https://helm.releases.hashicorp.com"
+#   chart      = "vault"
+#   # TODO upgrade vault helm version
+#   version    = "0.8.0"
 
-  namespace        = "vault"
-  create_namespace = true
+#   namespace        = "vault"
+#   create_namespace = true
 
-  # TODO HA Vault
-  # TODO Auto unseal Vault
-}
+#   # TODO HA Vault
+#   # TODO Auto unseal Vault
+# }
 
 # TODO automatic ingress and tunnel for all services
diff --git a/infra/platform/terraform.tf b/infra/terraform.tf
similarity index 100%
rename from infra/platform/terraform.tf
rename to infra/terraform.tf
diff --git a/infra/platform/variables.tf b/infra/variables.tf
similarity index 100%
rename from infra/platform/variables.tf
rename to infra/variables.tf