From c749c277e4f0ab308e143502c470b7d0690c7820 Mon Sep 17 00:00:00 2001
From: Wulf Thimm <12035025+wulfthimm@users.noreply.github.com>
Date: Fri, 18 Dec 2020 14:43:49 +0100
Subject: [PATCH] [terraform] updated gcp terraform scripts (#2556)

---
 chart/values.yaml                             |   4 +-
 install/gcp-full-terraform/.gitignore         |   1 -
 install/gcp-full-terraform/Makefile           |  19 --
 .../gcp-full-terraform/default.auto.tfvars    |   4 -
 install/gcp-full-terraform/main.tf            | 192 -------------
 .../gcp-full-terraform/modules/dns/main.tf    |  54 ----
 .../gcp-full-terraform/modules/dns/outputs.tf |  20 --
 .../modules/dns/variables.tf                  |  29 --
 .../gcp-full-terraform/modules/gitpod/main.tf |  63 -----
 .../gitpod/templates/node-affinity.tpl        |  23 --
 .../modules/gitpod/templates/node-layout.tpl  |  15 -
 .../modules/gitpod/templates/values.tpl       |  10 -
 .../modules/gitpod/variables.tf               |  58 ----
 .../gcp-full-terraform/modules/https/main.tf  | 186 -------------
 .../modules/https/output.tf                   |  12 -
 .../templates/cert-manager_certificate.tpl    |  15 -
 .../modules/https/templates/values.tpl        |   9 -
 .../modules/kubernetes/README.md              |   1 -
 .../modules/kubernetes/locals.tf              |  18 --
 .../modules/kubernetes/main.tf                | 196 -------------
 .../modules/kubernetes/outputs.tf             |  20 --
 .../kubernetes/templates/kubeconfig.tpl       |  20 --
 .../modules/kubernetes/variables.tf           |  96 -------
 .../modules/monitoring/main.tf                |  17 --
 .../modules/mysql_gcp/README.md               |   3 -
 .../modules/mysql_gcp/locals.tf               |  26 --
 .../modules/mysql_gcp/main.tf                 | 259 ------------------
 .../modules/mysql_gcp/outputs.tf              |  16 --
 .../modules/mysql_gcp/templates/values.tpl    |  16 --
 .../modules/mysql_gcp/variables.tf            |  96 -------
 .../modules/mysql_helm/main.tf                | 138 ----------
 .../modules/mysql_helm/templates/values.tpl   |  16 --
 .../modules/mysql_helm/variables.tf           |  46 ----
 .../modules/network/README.md                 |   1 -
 .../modules/network/main.tf                   |  58 ----
 .../modules/network/outputs.tf                |  20 --
 .../modules/network/variables.tf              |  33 ---
 .../modules/registry/README.md                |   1 -
 .../modules/registry/main.tf                  | 130 ---------
 .../modules/registry/outputs.tf               |  16 --
 .../registry/templates/registry-auth.tpl      |   7 -
 .../modules/registry/templates/values.tpl     |  17 --
 .../modules/storage/locals.tf                 |  11 -
 .../modules/storage/main.tf                   | 135 ---------
 .../modules/storage/outputs.tf                |  16 --
 .../modules/storage/templates/values.tpl      |  33 ---
 .../modules/storage/variables.tf              |  78 ------
 install/gcp-full-terraform/outputs.tf         |  36 ---
 install/gcp-full-terraform/provider.tf        |  54 ----
 .../gcp-full-terraform/templates/values.tpl   |  64 -----
 install/gcp-terraform/BUILD.yaml              |  30 --
 .../gcp-terraform/environment/full/.gitignore |   3 +
 .../environment/full}/README.md               |   0
 .../gcp-terraform/environment/full/main.tf    | 131 +++++++++
 .../environment/full/providers.tf             |  37 +++
 .../environment/full/values.yaml              |  11 +
 .../environment/full}/variables.tf            |  31 ++-
 .../environment/full/versions.tf              |  23 ++
 .../{ => environment/installer}/.gitignore    |   0
 .../environment/installer}/BUILD.yaml         |   4 +-
 .../installer}/main.auto.tfvars               |   0
 .../environment/installer/main.tf             |  88 ++++++
 .../environment/installer/modules             |   1 +
 .../{ => environment/installer}/outputs.tf    |   6 +-
 .../environment/installer/providers.tf        |  28 ++
 .../installer/templates/values.tpl            |  18 ++
 .../{ => environment/installer}/variables.tf  |   3 +-
 install/gcp-terraform/main.tf                 |  82 ------
 install/gcp-terraform/modules/BUILD.yaml      |  24 ++
 .../gcp-terraform/modules/certmanager/main.tf | 122 +++++++++
 .../locals.tf => certmanager/outputs.tf}      |   6 +-
 .../certmanager/templates/certificate.tpl     |  18 ++
 .../certmanager/templates/clusterissuer.tpl}  |  15 +-
 .../modules/certmanager/templates/values.tpl  |   5 +
 .../modules/certmanager}/variables.tf         |  37 +--
 .../modules/certmanager/versions.tf           |  21 ++
 .../gcp-terraform/modules/database/README.md  |  10 +
 .../gcp-terraform/modules/database/main.tf    | 227 +++++++++++++++
 .../modules/database/outputs.tf}              |   9 +-
 .../modules/database/templates/values.tpl     |  20 ++
 .../modules/database/variables.tf             |  40 +++
 .../modules/dns/README.md                     |   0
 install/gcp-terraform/modules/dns/locals.tf   |   3 +
 install/gcp-terraform/modules/dns/main.tf     |  88 ++++++
 install/gcp-terraform/modules/dns/outputs.tf  |  20 ++
 .../modules/dns/templates/values.tpl          |  13 +
 .../modules/dns}/variables.tf                 |  25 +-
 install/gcp-terraform/modules/dns/versions.tf |  16 ++
 install/gcp-terraform/modules/gitpod/main.tf  |  47 ++++
 .../templates/values.node-layout.tpl}         |   5 +-
 .../modules/gitpod/templates/values.tpl       |   7 +
 .../gcp-terraform/modules/gitpod/variables.tf |  61 +++++
 install/gcp-terraform/modules/helm/main.tf    |  82 ------
 .../modules/helm/templates/node-affinity.tpl  |  23 --
 .../modules/helm/templates/values.tpl         |  13 -
 .../gcp-terraform/modules/helm/variables.tf   |  66 -----
 .../gcp-terraform/modules/kubeconfig/main.tf  |  33 +++
 .../modules/kubeconfig/outputs.tf}            |   5 +-
 .../kubeconfig/templates/kubeconfig.tpl       |  26 ++
 .../modules/kubeconfig/terraform.tf}          |  19 +-
 .../modules/kubeconfig/variables.tf}          |  13 +-
 .../modules/kubernetes/README.md              |  18 ++
 .../modules/kubernetes/locals.tf              |  18 --
 .../gcp-terraform/modules/kubernetes/main.tf  | 181 ++++++------
 .../modules/kubernetes/outputs.tf             |   9 +-
 .../kubernetes/templates/kubeconfig.tpl       |  20 --
 .../modules/kubernetes/variables.tf           |  61 +----
 .../gcp-terraform/modules/monitoring/main.tf  |  17 --
 install/gcp-terraform/modules/network/main.tf |  43 ---
 .../gcp-terraform/modules/network/outputs.tf  |  17 --
 .../modules/network/variables.tf              |  19 --
 .../modules/registry}/README.md               |   0
 .../gcp-terraform/modules/registry/main.tf    |  91 +++---
 .../gcp-terraform/modules/registry/outputs.tf |  10 +-
 .../registry/templates/registry-auth.tpl      |   2 +-
 .../modules/registry/templates/values.tpl     |  10 +-
 .../modules/registry/variables.tf             |  15 +-
 .../modules/storage/README.md                 |   0
 .../gcp-terraform/modules/storage/locals.tf   |  11 -
 install/gcp-terraform/modules/storage/main.tf |  91 ++----
 .../gcp-terraform/modules/storage/outputs.tf  |   6 +-
 .../modules/storage/templates/values.tpl      |  68 +++--
 .../modules/storage/variables.tf              |  25 +-
 install/gcp-terraform/provider.tf             |  54 ----
 install/gcp-terraform/templates/values.tpl    |   0
 install/installer/BUILD.yaml                  |   3 +-
 install/installer/dev-layout.yaml             |   2 +-
 install/installer/leeway.Dockerfile           |   3 +-
 128 files changed, 1489 insertions(+), 3328 deletions(-)
 delete mode 100644 install/gcp-full-terraform/.gitignore
 delete mode 100644 install/gcp-full-terraform/Makefile
 delete mode 100644 install/gcp-full-terraform/default.auto.tfvars
 delete mode 100644 install/gcp-full-terraform/main.tf
 delete mode 100644 install/gcp-full-terraform/modules/dns/main.tf
 delete mode 100644 install/gcp-full-terraform/modules/dns/outputs.tf
 delete mode 100644 install/gcp-full-terraform/modules/dns/variables.tf
 delete mode 100644 install/gcp-full-terraform/modules/gitpod/main.tf
 delete mode 100644 install/gcp-full-terraform/modules/gitpod/templates/node-affinity.tpl
 delete mode 100644 install/gcp-full-terraform/modules/gitpod/templates/node-layout.tpl
 delete mode 100644 install/gcp-full-terraform/modules/gitpod/templates/values.tpl
 delete mode 100644 install/gcp-full-terraform/modules/gitpod/variables.tf
 delete mode 100644 install/gcp-full-terraform/modules/https/main.tf
 delete mode 100644 install/gcp-full-terraform/modules/https/output.tf
 delete mode 100644 install/gcp-full-terraform/modules/https/templates/cert-manager_certificate.tpl
 delete mode 100644 install/gcp-full-terraform/modules/https/templates/values.tpl
 delete mode 100644 install/gcp-full-terraform/modules/kubernetes/README.md
 delete mode 100644 install/gcp-full-terraform/modules/kubernetes/locals.tf
 delete mode 100644 install/gcp-full-terraform/modules/kubernetes/main.tf
 delete mode 100644 install/gcp-full-terraform/modules/kubernetes/outputs.tf
 delete mode 100644 install/gcp-full-terraform/modules/kubernetes/templates/kubeconfig.tpl
 delete mode 100644 install/gcp-full-terraform/modules/kubernetes/variables.tf
 delete mode 100644 install/gcp-full-terraform/modules/monitoring/main.tf
 delete mode 100644 install/gcp-full-terraform/modules/mysql_gcp/README.md
 delete mode 100644 install/gcp-full-terraform/modules/mysql_gcp/locals.tf
 delete mode 100644 install/gcp-full-terraform/modules/mysql_gcp/main.tf
 delete mode 100644 install/gcp-full-terraform/modules/mysql_gcp/outputs.tf
 delete mode 100644 install/gcp-full-terraform/modules/mysql_gcp/templates/values.tpl
 delete mode 100644 install/gcp-full-terraform/modules/mysql_gcp/variables.tf
 delete mode 100644 install/gcp-full-terraform/modules/mysql_helm/main.tf
 delete mode 100644 install/gcp-full-terraform/modules/mysql_helm/templates/values.tpl
 delete mode 100644 install/gcp-full-terraform/modules/mysql_helm/variables.tf
 delete mode 100644 install/gcp-full-terraform/modules/network/README.md
 delete mode 100644 install/gcp-full-terraform/modules/network/main.tf
 delete mode 100644 install/gcp-full-terraform/modules/network/outputs.tf
 delete mode 100644 install/gcp-full-terraform/modules/network/variables.tf
 delete mode 100644 install/gcp-full-terraform/modules/registry/README.md
 delete mode 100644 install/gcp-full-terraform/modules/registry/main.tf
 delete mode 100644 install/gcp-full-terraform/modules/registry/outputs.tf
 delete mode 100644 install/gcp-full-terraform/modules/registry/templates/registry-auth.tpl
 delete mode 100644 install/gcp-full-terraform/modules/registry/templates/values.tpl
 delete mode 100644 install/gcp-full-terraform/modules/storage/locals.tf
 delete mode 100644 install/gcp-full-terraform/modules/storage/main.tf
 delete mode 100644 install/gcp-full-terraform/modules/storage/outputs.tf
 delete mode 100644 install/gcp-full-terraform/modules/storage/templates/values.tpl
 delete mode 100644 install/gcp-full-terraform/modules/storage/variables.tf
 delete mode 100644 install/gcp-full-terraform/outputs.tf
 delete mode 100644 install/gcp-full-terraform/provider.tf
 delete mode 100644 install/gcp-full-terraform/templates/values.tpl
 delete mode 100644 install/gcp-terraform/BUILD.yaml
 create mode 100644 install/gcp-terraform/environment/full/.gitignore
 rename install/{gcp-full-terraform => gcp-terraform/environment/full}/README.md (100%)
 create mode 100644 install/gcp-terraform/environment/full/main.tf
 create mode 100644 install/gcp-terraform/environment/full/providers.tf
 create mode 100644 install/gcp-terraform/environment/full/values.yaml
 rename install/{gcp-full-terraform => gcp-terraform/environment/full}/variables.tf (67%)
 create mode 100644 install/gcp-terraform/environment/full/versions.tf
 rename install/gcp-terraform/{ => environment/installer}/.gitignore (100%)
 rename install/{gcp-full-terraform => gcp-terraform/environment/installer}/BUILD.yaml (93%)
 rename install/gcp-terraform/{ => environment/installer}/main.auto.tfvars (100%)
 create mode 100644 install/gcp-terraform/environment/installer/main.tf
 create mode 120000 install/gcp-terraform/environment/installer/modules
 rename install/gcp-terraform/{ => environment/installer}/outputs.tf (65%)
 create mode 100644 install/gcp-terraform/environment/installer/providers.tf
 create mode 100644 install/gcp-terraform/environment/installer/templates/values.tpl
 rename install/gcp-terraform/{ => environment/installer}/variables.tf (93%)
 delete mode 100644 install/gcp-terraform/main.tf
 create mode 100644 install/gcp-terraform/modules/BUILD.yaml
 create mode 100644 install/gcp-terraform/modules/certmanager/main.tf
 rename install/gcp-terraform/modules/{monitoring/locals.tf => certmanager/outputs.tf} (70%)
 create mode 100644 install/gcp-terraform/modules/certmanager/templates/certificate.tpl
 rename install/{gcp-full-terraform/modules/https/templates/cert-manager_cluster-issuer.tpl => gcp-terraform/modules/certmanager/templates/clusterissuer.tpl} (52%)
 create mode 100644 install/gcp-terraform/modules/certmanager/templates/values.tpl
 rename install/{gcp-full-terraform/modules/https => gcp-terraform/modules/certmanager}/variables.tf (54%)
 create mode 100644 install/gcp-terraform/modules/certmanager/versions.tf
 create mode 100644 install/gcp-terraform/modules/database/README.md
 create mode 100644 install/gcp-terraform/modules/database/main.tf
 rename install/{gcp-full-terraform/modules/registry/locals.tf => gcp-terraform/modules/database/outputs.tf} (68%)
 create mode 100644 install/gcp-terraform/modules/database/templates/values.tpl
 create mode 100644 install/gcp-terraform/modules/database/variables.tf
 rename install/{gcp-full-terraform => gcp-terraform}/modules/dns/README.md (100%)
 create mode 100644 install/gcp-terraform/modules/dns/locals.tf
 create mode 100644 install/gcp-terraform/modules/dns/main.tf
 create mode 100644 install/gcp-terraform/modules/dns/outputs.tf
 create mode 100644 install/gcp-terraform/modules/dns/templates/values.tpl
 rename install/{gcp-full-terraform/modules/registry => gcp-terraform/modules/dns}/variables.tf (66%)
 create mode 100644 install/gcp-terraform/modules/dns/versions.tf
 create mode 100644 install/gcp-terraform/modules/gitpod/main.tf
 rename install/gcp-terraform/modules/{helm/templates/node-layout.tpl => gitpod/templates/values.node-layout.tpl} (85%)
 create mode 100644 install/gcp-terraform/modules/gitpod/templates/values.tpl
 create mode 100644 install/gcp-terraform/modules/gitpod/variables.tf
 delete mode 100644 install/gcp-terraform/modules/helm/main.tf
 delete mode 100644 install/gcp-terraform/modules/helm/templates/node-affinity.tpl
 delete mode 100644 install/gcp-terraform/modules/helm/templates/values.tpl
 delete mode 100644 install/gcp-terraform/modules/helm/variables.tf
 create mode 100644 install/gcp-terraform/modules/kubeconfig/main.tf
 rename install/{gcp-full-terraform/modules/dns/locals.tf => gcp-terraform/modules/kubeconfig/outputs.tf} (74%)
 create mode 100644 install/gcp-terraform/modules/kubeconfig/templates/kubeconfig.tpl
 rename install/{gcp-full-terraform/modules/mysql_helm/outputs.tf => gcp-terraform/modules/kubeconfig/terraform.tf} (51%)
 rename install/{gcp-full-terraform/modules/monitoring/locals.tf => gcp-terraform/modules/kubeconfig/variables.tf} (66%)
 create mode 100644 install/gcp-terraform/modules/kubernetes/README.md
 delete mode 100644 install/gcp-terraform/modules/kubernetes/locals.tf
 delete mode 100644 install/gcp-terraform/modules/kubernetes/templates/kubeconfig.tpl
 delete mode 100644 install/gcp-terraform/modules/monitoring/main.tf
 delete mode 100644 install/gcp-terraform/modules/network/main.tf
 delete mode 100644 install/gcp-terraform/modules/network/outputs.tf
 delete mode 100644 install/gcp-terraform/modules/network/variables.tf
 rename install/{gcp-full-terraform/modules/monitoring => gcp-terraform/modules/registry}/README.md (100%)
 rename install/{gcp-full-terraform => gcp-terraform}/modules/storage/README.md (100%)
 delete mode 100644 install/gcp-terraform/modules/storage/locals.tf
 delete mode 100644 install/gcp-terraform/provider.tf
 delete mode 100644 install/gcp-terraform/templates/values.tpl

diff --git a/chart/values.yaml b/chart/values.yaml
index 211c819693b971..f3ef4ec72f3898 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -311,11 +311,11 @@ components:
       http:
         expose: true
         containerPort: 80
-        nodePort: 31080
+        # nodePort: 31080
       https:
         expose: true
         containerPort: 443
-        nodePort: 31443
+        # nodePort: 31443
     loadBalancerIP: null
     serviceType: "LoadBalancer"
     serviceSessionAffinity: "None"
diff --git a/install/gcp-full-terraform/.gitignore b/install/gcp-full-terraform/.gitignore
deleted file mode 100644
index 0696b3ebc1b70e..00000000000000
--- a/install/gcp-full-terraform/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.terraform
\ No newline at end of file
diff --git a/install/gcp-full-terraform/Makefile b/install/gcp-full-terraform/Makefile
deleted file mode 100644
index 2848fa3e5ecf23..00000000000000
--- a/install/gcp-full-terraform/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-.PHONY: init
-init:
-	terraform init
-
-.PHONY: refresh
-refresh: init
-	terraform refresh
-
-.PHONY: test
-test: refresh
-	terraform plan
-
-.PHONY: install
-install: test
-	terraform apply --auto-approve
-
-.PHONY: uninstall
-uninstall: refresh
-	terraform destroy --auto-approve
\ No newline at end of file
diff --git a/install/gcp-full-terraform/default.auto.tfvars b/install/gcp-full-terraform/default.auto.tfvars
deleted file mode 100644
index 1b34dee59677fe..00000000000000
--- a/install/gcp-full-terraform/default.auto.tfvars
+++ /dev/null
@@ -1,4 +0,0 @@
-container_registry = {
-  location = "EU"
-}
-certificate_email = "certificates@your-domain.com"
diff --git a/install/gcp-full-terraform/main.tf b/install/gcp-full-terraform/main.tf
deleted file mode 100644
index 45da1b5c53cefd..00000000000000
--- a/install/gcp-full-terraform/main.tf
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-# 1st stage of deployment, no dependencies
-
-#
-# Network
-#
-
-module "network" {
-  source = "./modules/network"
-
-  project = var.project
-  region  = var.region
-  name    = "vpc-gitpod"
-}
-
-
-
-#
-# DNS
-#
-
-module "dns" {
-  source = "./modules/dns"
-
-  project  = var.project
-  region   = var.region
-  dns_name = var.dns_name
-
-}
-
-
-
-
-
-# 2nd stage of deployment, dependent on networking
-
-#
-# Kubernetes
-#
-
-module "kubernetes" {
-  source = "./modules/kubernetes"
-
-  name     = "gitpod-cluster"
-  project  = var.project
-  location = var.region
-  network  = module.network.vpc.name
-  subnets  = module.network.subnets.*.self_link
-
-  requirements = {
-    network = module.network.done
-  }
-
-}
-
-
-
-
-
-# 3rd stage of deployment, dependent on kubernetes at least
-
-#
-# Registry
-#
-
-module "registry" {
-  source = "./modules/registry"
-
-  project  = var.project
-  location = var.container_registry.location
-  # https://cloud.google.com/container-registry/docs/pushing-and-pulling#pushing_an_image_to_a_registry
-  hostname = "eu.gcr.io"
-
-  requirements = {
-    kubernetes = module.kubernetes.done
-  }
-}
-
-
-
-#
-# Storage
-#
-
-module "storage" {
-  source = "./modules/storage"
-
-  project  = var.project
-  region   = var.region
-  location = "EU"
-
-  requirements = {
-    kubernetes = module.kubernetes.done
-  }
-}
-
-
-
-#
-# Database
-#
-
-module "database" {
-  source = "./modules/mysql_gcp"
-
-  project = var.project
-  region  = var.region
-  network = {
-    id   = module.network.vpc.id
-    name = module.network.vpc.name
-  }
-  subnets = module.network.subnets.*.name
-  requirements = {
-    kubernetes = module.kubernetes.done
-  }
-}
-
-
-
-#
-# HTTPS
-#
-
-module "https" {
-  source = "./modules/https"
-
-  certificate_email = var.certificate_email
-  dns_name          = module.dns.zone.dns_name
-  project           = var.project
-  gitpod = {
-    namespace = var.kubernetes.namespace
-  }
-  kubeconfig = module.kubernetes.kubeconfig
-
-  requirements = {
-    kubernetes = module.kubernetes.done
-    dns        = module.dns.done
-  }
-}
-
-
-#
-# Gitpod
-#
-
-# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
-data "template_file" "gitpod_values" {
-  template = file("${path.root}/templates/values.tpl")
-  vars = {
-
-  }
-}
-
-
-
-module "gitpod" {
-  source = "./modules/gitpod"
-
-  project = var.project
-  region  = var.region
-  kubernetes = {
-    namespace = var.kubernetes.namespace
-  }
-  hostname       = module.dns.zone.dns_name
-  loadBalancerIP = module.dns.static_ip
-  path           = "${path.root}/../../chart"
-  values = [
-    data.template_file.gitpod_values.rendered,
-    module.database.values,
-    module.storage.values,
-    module.registry.values,
-    module.https.values,
-  ]
-
-  gitpod = {
-    license = var.license
-  }
-
-  requirements = [
-    module.network.done,
-    module.kubernetes.done,
-    module.database.done,
-    module.storage.done,
-    module.registry.done,
-    module.dns.done,
-    module.https.done,
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/dns/main.tf b/install/gcp-full-terraform/modules/dns/main.tf
deleted file mode 100644
index a5a36fc17c23ec..00000000000000
--- a/install/gcp-full-terraform/modules/dns/main.tf
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/dns_managed_zone
-resource "google_dns_managed_zone" "gitpod" {
-  name     = replace(trimsuffix(var.dns_name, ".-"), ".", "-")
-  dns_name = "${trimsuffix(var.dns_name, ".-")}."
-}
-
-
-
-#
-# Static IP
-#
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_address
-resource "google_compute_address" "gitpod" {
-  name = "gitpod-static-ip"
-
-  project = var.project
-  region  = var.region
-}
-
-
-
-#
-# DNS records
-#
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/dns_record_set
-resource "google_dns_record_set" "gitpod" {
-  count        = length(local.dns_prefixes)
-  name         = "${local.dns_prefixes[count.index]}${google_dns_managed_zone.gitpod.dns_name}"
-  type         = "A"
-  ttl          = 300
-  managed_zone = google_dns_managed_zone.gitpod.name
-  rrdatas      = [google_compute_address.gitpod.address]
-  project      = var.project
-}
-
-
-
-#
-# End
-#
-
-resource "null_resource" "done" {
-  depends_on = [
-    google_dns_record_set.gitpod
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/dns/outputs.tf b/install/gcp-full-terraform/modules/dns/outputs.tf
deleted file mode 100644
index c1398067109f84..00000000000000
--- a/install/gcp-full-terraform/modules/dns/outputs.tf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-#
-#
-
-output "zone" {
-  value = google_dns_managed_zone.gitpod
-}
-
-output "static_ip" {
-  value = google_compute_address.gitpod.address
-}
-
-output "done" {
-  value = null_resource.done.id
-}
diff --git a/install/gcp-full-terraform/modules/dns/variables.tf b/install/gcp-full-terraform/modules/dns/variables.tf
deleted file mode 100644
index 6771c3c6a0e75b..00000000000000
--- a/install/gcp-full-terraform/modules/dns/variables.tf
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Project
-#
-
-variable "project" {
-  type    = string
-  default = "gitpod"
-}
-
-
-#
-# Region
-#
-variable "region" {
-  type = string
-}
-
-#
-# DNS Name
-#
-
-variable "dns_name" {
-  type = string
-}
diff --git a/install/gcp-full-terraform/modules/gitpod/main.tf b/install/gcp-full-terraform/modules/gitpod/main.tf
deleted file mode 100644
index 31676199d4e9fc..00000000000000
--- a/install/gcp-full-terraform/modules/gitpod/main.tf
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-
-
-
-data "template_file" "gitpod_values_node_affinity" {
-  template = file("${path.module}/templates/node-affinity.tpl")
-}
-
-data "template_file" "gitpod_values_node_layout" {
-  template = file("${path.module}/templates/node-layout.tpl")
-}
-
-
-resource "helm_release" "gitpod" {
-  name  = "gitpod-self-hosted"
-  chart = var.path
-
-  namespace        = var.kubernetes.namespace
-  create_namespace = true
-
-  timeout = "60"
-
-  wait = false
-
-  values = var.values
-
-
-  set {
-    name  = "hostname"
-    value = trimsuffix(var.hostname, ".")
-  }
-
-  set {
-    name  = "components.proxy.loadBalancerIP"
-    value = var.loadBalancerIP
-  }
-
-  set {
-    name  = "installPodSecurityPolicies"
-    value = "true"
-  }
-
-  depends_on = [
-    var.requirements
-  ]
-
-}
-
-
-
-#
-# End
-#
-
-resource "null_resource" "done" {
-  depends_on = [
-    helm_release.gitpod
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/gitpod/templates/node-affinity.tpl b/install/gcp-full-terraform/modules/gitpod/templates/node-affinity.tpl
deleted file mode 100644
index b81bbee1cef76b..00000000000000
--- a/install/gcp-full-terraform/modules/gitpod/templates/node-affinity.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-affinity:
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: gitpod.io/workload_meta
-          operator: In
-          values:
-          - "true"
-
-components:
-  workspace:
-    template:
-      spec:
-        affinity:
-          nodeAffinity:
-            requiredDuringSchedulingIgnoredDuringExecution:
-              nodeSelectorTerms:
-              - matchExpressions:
-                - key: gitpod.io/workload_workspace
-                  operator: In
-                  values:
-                  - "true"
\ No newline at end of file
diff --git a/install/gcp-full-terraform/modules/gitpod/templates/node-layout.tpl b/install/gcp-full-terraform/modules/gitpod/templates/node-layout.tpl
deleted file mode 100644
index a56c9b86b7b05f..00000000000000
--- a/install/gcp-full-terraform/modules/gitpod/templates/node-layout.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-components:
-  nodeDaemon:
-    # Gitpod copies Theia to each node. This setting configures where Theia is copied to.
-    # We'll copy Theia to $theiaHostBasePath/theia/theia-$version
-    # The faster this location is (in terms of IO) the faster nodes will become available and the faster workspaces will start.
-    theiaHostBasePath: /mnt/disks/ssd0
-  imageBuilder:
-    # The image builder deploys a Docker-in-Docker-daemon. By default that Docker daemon works in an empty-dir on the node.
-    # Depending on the types of node you operate that may cause image builds to fail or not perform well. We recommend you give the Docker daemon
-    # fast storage on the node, e.g. an SSD.
-    hostDindData: /mnt/disks/ssd0/docker
-  wsDaemon:
-    # Workspace data is stored on the nodes. This setting configures where on the ndoe the workspace data lives.
-    # The faster this location is (in terms of IO) the faster workspaces will initialize.
-    hostWorkspaceArea: /mnt/disks/ssd0/workspaces
diff --git a/install/gcp-full-terraform/modules/gitpod/templates/values.tpl b/install/gcp-full-terraform/modules/gitpod/templates/values.tpl
deleted file mode 100644
index 67a6119f255bee..00000000000000
--- a/install/gcp-full-terraform/modules/gitpod/templates/values.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Terraform Module: gitpod
-#
-
-hostname: ${hostname}
-components:
-  proxy:
-    loadBalancerIP: ${loadBalancerIP}
-
-installPodSecurityPolicies: true
diff --git a/install/gcp-full-terraform/modules/gitpod/variables.tf b/install/gcp-full-terraform/modules/gitpod/variables.tf
deleted file mode 100644
index 798b38d9aaa4c4..00000000000000
--- a/install/gcp-full-terraform/modules/gitpod/variables.tf
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-variable "project" {
-  type = string
-}
-
-
-
-variable "region" {
-  type = string
-}
-
-
-variable "kubernetes" {
-  type = object({
-    namespace = string
-  })
-  default = {
-    namespace = "gitpod"
-  }
-}
-
-variable "hostname" {
-  type = string
-}
-
-variable "loadBalancerIP" {
-  type = string
-}
-
-variable "path" {
-  type = string
-}
-
-
-#
-# Gitpod values
-#
-
-variable "values" {
-  type = list(string)
-}
-
-variable "requirements" {
-  type = list(string)
-}
-
-variable "gitpod" {
-  type = object({
-    license = string
-  })
-  default = {
-    license = ""
-  }
-}
\ No newline at end of file
diff --git a/install/gcp-full-terraform/modules/https/main.tf b/install/gcp-full-terraform/modules/https/main.tf
deleted file mode 100644
index 2b02647eddee4c..00000000000000
--- a/install/gcp-full-terraform/modules/https/main.tf
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# GCP Resources
-#
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id
-resource "random_id" "cert_manager" {
-  byte_length = 1
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_service_account
-resource "google_service_account" "cert_manager" {
-  account_id   = "cert-manager-${random_id.cert_manager.hex}"
-  display_name = "${var.project} Cert-Manager"
-  description  = "${var.project} Cert-Manager Account"
-  project      = var.project
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_iam#google_project_iam_member
-resource "google_project_iam_member" "project" {
-  project = var.project
-  role    = "roles/dns.admin"
-  member  = "serviceAccount:${google_service_account.cert_manager.email}"
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_service_account_key
-resource "google_service_account_key" "cert_manager" {
-  service_account_id = google_service_account.cert_manager.name
-}
-
-
-#
-# Kubernetes Resources
-#
-
-# https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release
-resource "helm_release" "cert_manager" {
-  name       = var.cert_manager.name
-  chart      = var.cert_manager.chart
-  repository = var.cert_manager.repository
-
-  namespace        = var.cert_manager.namespace
-  create_namespace = true
-
-  wait = true
-
-  set {
-    name  = "installCRDs"
-    value = "true"
-  }
-
-  depends_on = [
-    var.requirements
-  ]
-
-}
-
-# https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/secret
-resource "kubernetes_secret" "cert_manager" {
-  metadata {
-    name      = "clouddns-dns01-solver-svc-acct"
-    namespace = var.cert_manager.namespace
-  }
-
-  data = {
-    "key.json" = base64decode(google_service_account_key.cert_manager.private_key)
-  }
-
-  depends_on = [
-    helm_release.cert_manager
-  ]
-
-}
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password
-resource "random_password" "cert_manager_secret" {
-  length  = 32
-  special = false
-}
-
-
-# https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep
-resource "time_sleep" "cert_manager" {
-  create_duration = "300s"
-  depends_on = [
-    helm_release.cert_manager
-  ]
-}
-
-
-#
-# Cluster Issuer
-#
-
-# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
-data "template_file" "cluster_issuer" {
-  template = file("${path.module}/templates/cert-manager_cluster-issuer.tpl")
-  vars = {
-    email   = var.certificate_email
-    project = var.project
-  }
-}
-
-# https://registry.terraform.io/providers/mildred/null/latest/docs/resources/null_resource
-resource "null_resource" "cert_manager_cluster_issuer" {
-
-  provisioner "local-exec" {
-    command = "KUBECONFIG=${path.root}/secrets/kubeconfig kubectl apply --validate=false -f -<<EOF\n${data.template_file.cluster_issuer.rendered}\nEOF"
-  }
-
-  depends_on = [
-    kubernetes_secret.cert_manager,
-    time_sleep.cert_manager
-  ]
-}
-
-
-
-#
-# Certificate
-#
-
-# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
-data "template_file" "certificate" {
-  template = file("${path.module}/templates/cert-manager_certificate.tpl")
-  vars = {
-    secretName = "proxy-config-certificates"
-    dns_zone   = trimsuffix(var.dns_name, ".")
-    namespace  = var.gitpod.namespace
-  }
-}
-
-# https://registry.terraform.io/providers/mildred/null/latest/docs/resources/null_resource
-resource "null_resource" "cert_manager_certificate" {
-  provisioner "local-exec" {
-    command = "kubectl apply --kubeconfig ${path.root}/secrets/kubeconfig --validate=false -f -<<EOF\n${data.template_file.certificate.rendered}\nEOF"
-  }
-  depends_on = [
-    null_resource.cert_manager_cluster_issuer
-  ]
-}
-
-
-
-
-
-#
-# values.yaml
-#
-
-# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
-data "template_file" "gitpod_https_values" {
-  template = file("${path.module}/templates/values.tpl")
-  vars = {
-    secretName    = "proxy-config-certificates"
-    fullChainName = "tls.crt"
-    chainName     = "tls.crt"
-    keyName       = "tls.key"
-  }
-}
-
-
-
-
-
-#
-# End
-#
-
-# https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep
-resource "time_sleep" "cert_manager_done" {
-  create_duration = "300s"
-  depends_on = [
-    null_resource.cert_manager_certificate
-  ]
-}
-
-resource "null_resource" "done" {
-  depends_on = [
-    time_sleep.cert_manager_done
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/https/output.tf b/install/gcp-full-terraform/modules/https/output.tf
deleted file mode 100644
index 6efa49a88dd769..00000000000000
--- a/install/gcp-full-terraform/modules/https/output.tf
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-output "values" {
-  value = data.template_file.gitpod_https_values.rendered
-}
-
-output "done" {
-  value = null_resource.done.id
-}
diff --git a/install/gcp-full-terraform/modules/https/templates/cert-manager_certificate.tpl b/install/gcp-full-terraform/modules/https/templates/cert-manager_certificate.tpl
deleted file mode 100644
index a12a96888782b0..00000000000000
--- a/install/gcp-full-terraform/modules/https/templates/cert-manager_certificate.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: cert-manager.io/v1alpha2
-kind: Certificate
-metadata:
-  name: gitpod-certificate
-  namespace: ${namespace}
-spec:
-  secretName: ${secretName}
-  renewBefore: 24h
-  dnsNames:
-    - "${dns_zone}"
-    - "*.${dns_zone}"
-    - "*.ws.${dns_zone}"
-  issuerRef:
-    name: letsencrypt-issuer
-    kind: ClusterIssuer
\ No newline at end of file
diff --git a/install/gcp-full-terraform/modules/https/templates/values.tpl b/install/gcp-full-terraform/modules/https/templates/values.tpl
deleted file mode 100644
index 06e9a922a5e62d..00000000000000
--- a/install/gcp-full-terraform/modules/https/templates/values.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-certificatesSecret:
-    secretName: ${secretName}
-    fullChainName: ${fullChainName}
-    chainName: ${chainName}
-    keyName: ${keyName}
-
-gitpod_selfhosted:
-    variants:
-        customCerts: true
\ No newline at end of file
diff --git a/install/gcp-full-terraform/modules/kubernetes/README.md b/install/gcp-full-terraform/modules/kubernetes/README.md
deleted file mode 100644
index 6399e9cd96f49b..00000000000000
--- a/install/gcp-full-terraform/modules/kubernetes/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Gitpod: GKE
diff --git a/install/gcp-full-terraform/modules/kubernetes/locals.tf b/install/gcp-full-terraform/modules/kubernetes/locals.tf
deleted file mode 100644
index bbcf4f4417ee05..00000000000000
--- a/install/gcp-full-terraform/modules/kubernetes/locals.tf
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-locals {
-  roles = [
-    "roles/clouddebugger.agent",
-    "roles/cloudtrace.agent",
-    "roles/errorreporting.writer",
-    "roles/logging.viewer",
-    "roles/logging.logWriter",
-    "roles/monitoring.metricWriter",
-    "roles/monitoring.viewer",
-    "roles/storage.admin",
-    "roles/storage.objectAdmin",
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/kubernetes/main.tf b/install/gcp-full-terraform/modules/kubernetes/main.tf
deleted file mode 100644
index 27c2a7e6703d95..00000000000000
--- a/install/gcp-full-terraform/modules/kubernetes/main.tf
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Service Accounts
-#
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id
-resource "random_id" "gitpod_cluster" {
-  byte_length = 2
-}
-
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_service_account
-resource "google_service_account" "gitpod_cluster" {
-  account_id   = "gitpod-cluster-${random_id.gitpod_cluster.hex}"
-  display_name = "gitpod-cluster-${random_id.gitpod_cluster.hex}"
-  description  = "Gitpod Meta Nodes ${var.project}"
-  project      = var.project
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_iam
-resource "google_project_iam_binding" "gitpod_cluster" {
-  count   = length(local.roles)
-  project = var.project
-  role    = local.roles[count.index]
-  members = [
-    "serviceAccount:${google_service_account.gitpod_cluster.email}",
-  ]
-}
-
-
-
-#
-# Data
-#
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/compute_network
-data "google_compute_network" "gitpod" {
-  name = var.network
-
-  depends_on = [
-    var.requirements
-  ]
-
-}
-
-
-
-#
-# GKE Cluster
-#
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password
-resource "random_password" "kubernetes" {
-  length  = 32
-  special = false
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster
-resource "google_container_cluster" "gitpod" {
-  name     = "${var.name}-${random_id.gitpod_cluster.hex}"
-  project  = var.project
-  location = var.location
-
-  remove_default_node_pool = true
-  initial_node_count       = var.kubernetes.initial_node_count
-
-  master_auth {
-    username = var.username
-    password = random_password.kubernetes.result
-
-    client_certificate_config {
-      issue_client_certificate = true
-    }
-  }
-
-  network    = var.network
-  subnetwork = var.subnets[0]
-
-
-  min_master_version = "1.16.15-gke.4300"
-
-}
-
-
-
-#
-# GKE Nodepools
-#
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_node_pool
-resource "google_container_node_pool" "gitpod_cluster" {
-
-  name       = "${google_container_cluster.gitpod.name}-${random_id.gitpod_cluster.hex}-nodepool"
-  location   = var.location
-  cluster    = google_container_cluster.gitpod.name
-  node_count = 1
-
-  node_config {
-    preemptible     = var.kubernetes.node_pool.preemptible
-    machine_type    = var.kubernetes.node_pool.machine_type
-    disk_size_gb    = var.kubernetes.node_pool.disk_size_gb
-    disk_type       = var.kubernetes.node_pool.disk_type
-    local_ssd_count = var.kubernetes.node_pool.local_ssd_count
-
-    metadata = {
-      disable-legacy-endpoints = "true"
-    }
-
-    labels = {
-      "gitpod.io/workload_meta"      = "true"
-      "gitpod.io/workload_workspace" = "true"
-    }
-
-    image_type = var.kubernetes.node_pool.image_type
-
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/logging.write",
-      "https://www.googleapis.com/auth/monitoring",
-      "https://www.googleapis.com/auth/devstorage.read_write",
-    ]
-
-    service_account = google_service_account.gitpod_cluster.email
-
-  }
-}
-
-
-
-#
-# Kubernetes Config File
-#
-
-# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
-data "template_file" "kubeconfig" {
-  template = file("${path.module}/templates/kubeconfig.tpl")
-  vars = {
-    server                     = google_container_cluster.gitpod.endpoint
-    certificate_authority_data = google_container_cluster.gitpod.master_auth[0].cluster_ca_certificate
-    name                       = google_container_cluster.gitpod.name
-    namespace                  = var.gitpod.namespace
-    # client_certificate         = google_container_cluster.gitpod.master_auth[0].client_certificate
-    # client_key                 = google_container_cluster.gitpod.master_auth[0].client_key
-    username = google_container_cluster.gitpod.master_auth[0].username
-    password = google_container_cluster.gitpod.master_auth[0].password
-  }
-
-  depends_on = [
-    google_container_node_pool.gitpod_cluster
-  ]
-
-}
-
-# https://registry.terraform.io/providers/hashicorp/local/latest/docs/resources/file
-resource "local_file" "gitpod_cluster_kubeconfig" {
-  content  = data.template_file.kubeconfig.rendered
-  filename = "${path.root}/secrets/kubeconfig"
-
-  depends_on = [
-    google_container_node_pool.gitpod_cluster
-  ]
-
-}
-
-# https://registry.terraform.io/providers/mildred/null/latest/docs/resources/null_resource
-resource "null_resource" "kubernetes_credentials" {
-  provisioner "local-exec" {
-    command = "gcloud container clusters get-credentials $CLUSTER --region $REGION --project $PROJECT"
-
-    environment = {
-      CLUSTER = var.name
-      REGION  = var.location
-      PROJECT = var.project
-    }
-  }
-
-  depends_on = [
-    google_container_cluster.gitpod
-  ]
-
-}
-
-
-
-#
-# End
-#
-
-resource "null_resource" "done" {
-  depends_on = [
-    google_container_node_pool.gitpod_cluster
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/kubernetes/outputs.tf b/install/gcp-full-terraform/modules/kubernetes/outputs.tf
deleted file mode 100644
index ad984d448884df..00000000000000
--- a/install/gcp-full-terraform/modules/kubernetes/outputs.tf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-#
-#
-
-output "cluster" {
-  value = google_container_cluster.gitpod
-}
-
-output "kubeconfig" {
-  value = data.template_file.kubeconfig.rendered
-}
-
-output "done" {
-  value = null_resource.done.id
-}
diff --git a/install/gcp-full-terraform/modules/kubernetes/templates/kubeconfig.tpl b/install/gcp-full-terraform/modules/kubernetes/templates/kubeconfig.tpl
deleted file mode 100644
index 1ee52b9eb0e676..00000000000000
--- a/install/gcp-full-terraform/modules/kubernetes/templates/kubeconfig.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: v1
-clusters:
-- cluster:
-    certificate-authority-data: ${certificate_authority_data}
-    server: https://${server}
-  name: ${name}-cluster
-contexts:
-- context:
-    cluster: ${name}-cluster
-    namespace: ${namespace}
-    user: ${name}-user
-  name: ${name}
-current-context: ${name}
-kind: Config
-preferences: {}
-users:
-- name: ${name}-user
-  user:
-    username: ${username}
-    password: ${password}
diff --git a/install/gcp-full-terraform/modules/kubernetes/variables.tf b/install/gcp-full-terraform/modules/kubernetes/variables.tf
deleted file mode 100644
index 5a66da86526f94..00000000000000
--- a/install/gcp-full-terraform/modules/kubernetes/variables.tf
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Project
-#
-
-variable "project" {
-  type = string
-}
-
-
-
-#
-# Region/Zone
-#
-
-variable "location" {
-  type = string
-}
-
-
-
-#
-# GKE Cluster Name
-#
-
-variable "name" {
-  type    = string
-  default = "gitpod-cluster"
-}
-
-variable "username" {
-  type    = string
-  default = "admin"
-}
-
-
-#
-# Network Name
-#
-
-variable "network" {
-  type = string
-}
-
-variable "subnets" {
-  type = list(string)
-}
-
-#
-# 
-#
-
-variable "gitpod" {
-  type = object({
-    namespace = string
-  })
-  default = {
-    namespace = "gitpod"
-  }
-}
-
-
-variable "kubernetes" {
-  type = object({
-    initial_node_count = number
-    node_pool = object({
-      preemptible     = bool
-      machine_type    = string
-      disk_size_gb    = number
-      disk_type       = string
-      local_ssd_count = number
-      image_type      = string
-    })
-  })
-  default = {
-    initial_node_count = 1
-    node_pool = {
-      preemptible     = false
-      machine_type    = "n1-standard-8"
-      disk_size_gb    = 100
-      disk_type       = "pd-standard"
-      local_ssd_count = 1
-      image_type      = "COS_CONTAINERD"
-    }
-  }
-}
-
-variable "requirements" {
-  type = object({
-    network = string
-  })
-}
diff --git a/install/gcp-full-terraform/modules/monitoring/main.tf b/install/gcp-full-terraform/modules/monitoring/main.tf
deleted file mode 100644
index bbca73f50282f0..00000000000000
--- a/install/gcp-full-terraform/modules/monitoring/main.tf
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Enable Service APIs
-#
-
-# # https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_service
-# resource "google_project_service" "gitpod_monitoring" {
-#   count   = length(local.google_services)
-#   project = var.project
-#   service = local.google_services[count.index]
-
-#   disable_dependent_services = false
-# }
diff --git a/install/gcp-full-terraform/modules/mysql_gcp/README.md b/install/gcp-full-terraform/modules/mysql_gcp/README.md
deleted file mode 100644
index fa457be27c3c25..00000000000000
--- a/install/gcp-full-terraform/modules/mysql_gcp/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Gitpod: Google Cloud SQL
-
-This module installs the MySQL database instance on GCP.
diff --git a/install/gcp-full-terraform/modules/mysql_gcp/locals.tf b/install/gcp-full-terraform/modules/mysql_gcp/locals.tf
deleted file mode 100644
index 40dd210235f8af..00000000000000
--- a/install/gcp-full-terraform/modules/mysql_gcp/locals.tf
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Locals
-#
-
-locals {
-  database = {
-    host          = google_sql_database_instance.gitpod_database.private_ip_address
-    root_password = google_sql_database_instance.gitpod_database.root_password
-    user          = google_sql_user.gitpod_database.name
-    password      = google_sql_user.gitpod_database.password
-  }
-  google_services = [
-    "sql-component.googleapis.com",
-    "sqladmin.googleapis.com",
-    "servicenetworking.googleapis.com",
-  ]
-  google_network_peering_routes = [
-    "servicenetworking-googleapis-com",
-    "cloudsql-mysql-googleapis-com",
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/mysql_gcp/main.tf b/install/gcp-full-terraform/modules/mysql_gcp/main.tf
deleted file mode 100644
index 73b0c316987598..00000000000000
--- a/install/gcp-full-terraform/modules/mysql_gcp/main.tf
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Enable Service APIs
-#
-
-# # https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_service
-# resource "google_project_service" "gitpod_database" {
-#   count   = length(local.google_services)
-#   project = var.project
-#   service = local.google_services[count.index]
-#   disable_dependent_services = false
-# }
-# # https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep
-# resource "time_sleep" "gitpod_database" {
-#   create_duration = "60s"
-#   depends_on = [
-#     google_project_service.gitpod_database
-#   ]
-# }
-
-
-
-#
-# Network Configuration
-#
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_global_address
-resource "google_compute_global_address" "gitpod_database" {
-  name          = "${var.project}-gitpod-db-private-ip"
-  address_type  = "INTERNAL"
-  purpose       = "VPC_PEERING"
-  prefix_length = 16
-  network       = var.network.id
-  project       = var.project
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/service_networking_connection
-resource "google_service_networking_connection" "gitpod_database" {
-  network                 = var.network.id
-  service                 = "servicenetworking.googleapis.com"
-  reserved_peering_ranges = [google_compute_global_address.gitpod_database.name]
-}
-
-
-
-#
-# Cloud SQL Instance
-#
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password
-resource "random_password" "gitpod_database_root" {
-  length  = 32
-  special = false
-}
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id
-resource "random_id" "gitpod_database" {
-  byte_length = 2
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/sql_database_instance
-resource "google_sql_database_instance" "gitpod_database" {
-  name             = "${var.database.name}-${random_id.gitpod_database.hex}"
-  database_version = var.database.version
-  region           = var.region
-
-  root_password = random_password.gitpod_database_root.result
-
-  settings {
-    tier      = var.database.tier
-    disk_type = var.database.disk_type
-    disk_size = var.database.disk_size
-    ip_configuration {
-      ipv4_enabled    = false
-      private_network = var.network.id
-    }
-  }
-
-  depends_on = [
-    google_service_networking_connection.gitpod_database,
-  ]
-
-}
-
-
-
-#
-# SQL Databases
-#
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/sql_database
-resource "google_sql_database" "gitpod_database" {
-  count     = length(var.database.tables)
-  name      = var.database.tables[count.index]
-  instance  = google_sql_database_instance.gitpod_database.name
-  charset   = var.database.charset
-  collation = var.database.collation
-}
-
-
-
-#
-# DB User
-#
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password
-resource "random_password" "gitpod_database_user" {
-  length  = 32
-  special = false
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/sql_user
-resource "google_sql_user" "gitpod_database" {
-  name     = var.database.username
-  instance = google_sql_database_instance.gitpod_database.name
-  password = random_password.gitpod_database_user.result
-  project  = var.project
-}
-
-# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
-data "template_file" "gitpod_values_database" {
-  template = file("${path.module}/templates/values.tpl")
-  vars = {
-    host     = google_sql_database_instance.gitpod_database.private_ip_address
-    password = google_sql_user.gitpod_database.password
-  }
-}
-
-#
-# Network Peering
-#
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_network_peering_routes_config
-resource "google_compute_network_peering_routes_config" "gitpod_database" {
-  count   = length(local.google_network_peering_routes)
-  peering = local.google_network_peering_routes[count.index]
-  network = var.network.name
-
-  import_custom_routes = true
-  export_custom_routes = true
-
-  depends_on = [
-    google_sql_database_instance.gitpod_database
-  ]
-
-}
-
-
-
-# https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep
-resource "time_sleep" "gitpod_database_peering" {
-  create_duration = "600s"
-  depends_on = [
-    google_sql_database.gitpod_database,
-    google_compute_network_peering_routes_config.gitpod_database
-  ]
-}
-
-
-
-#
-# Kubernetes Resources
-#
-
-# https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/secret
-resource "kubernetes_secret" "gitpod_database" {
-  metadata {
-    name      = "${var.database.name}-${random_id.gitpod_database.hex}"
-    namespace = var.gitpod.namespace
-  }
-
-  data = {
-    host          = google_sql_database_instance.gitpod_database.private_ip_address
-    root-password = google_sql_database_instance.gitpod_database.root_password
-    user          = google_sql_user.gitpod_database.name
-    password      = google_sql_user.gitpod_database.password
-  }
-
-  # This dependency is added to make sure that the kubernetes cluster is up and running before any kubernetes resource would be deployed
-  depends_on = [
-    time_sleep.gitpod_database_peering,
-    var.requirements
-  ]
-
-
-}
-
-# https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/job
-resource "kubernetes_job" "mysql_initializer" {
-  metadata {
-    name      = "gp-db-init-${random_id.gitpod_database.hex}"
-    namespace = var.gitpod.namespace
-  }
-  spec {
-    template {
-      metadata {}
-      spec {
-        container {
-          name    = "db-initialization"
-          image   = "gcr.io/gitpod-io/db-migrations:v0.4.0-dev-selfhosted-gitpod-db-init.15"
-          command = ["/init.sh", "&&", "echo", "finished"]
-          env {
-            name = "MYSQL_HOST"
-            value_from {
-              secret_key_ref {
-                name = "${var.database.name}-${random_id.gitpod_database.hex}"
-                key  = "host"
-              }
-            }
-          }
-          env {
-            name  = "MYSQL_USER"
-            value = "gitpod"
-          }
-          env {
-            name  = "MYSQL_PORT"
-            value = "3306"
-          }
-          env {
-            name = "MYSQL_ROOT_PASSWORD"
-            value_from {
-              secret_key_ref {
-                name = "${var.database.name}-${random_id.gitpod_database.hex}"
-                key  = "password"
-              }
-            }
-          }
-        }
-        restart_policy = "Never"
-      }
-    }
-    backoff_limit = 4
-  }
-
-  # This dependency is added to make sure that the kubernetes cluster is up and running before any kubernetes resource would be deployed
-  depends_on = [
-    time_sleep.gitpod_database_peering,
-    kubernetes_secret.gitpod_database,
-    var.requirements
-  ]
-
-}
-
-
-
-#
-# End
-#
-
-resource "null_resource" "done" {
-  depends_on = [
-    kubernetes_secret.gitpod_database,
-    kubernetes_job.mysql_initializer,
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/mysql_gcp/outputs.tf b/install/gcp-full-terraform/modules/mysql_gcp/outputs.tf
deleted file mode 100644
index 5affb80280a018..00000000000000
--- a/install/gcp-full-terraform/modules/mysql_gcp/outputs.tf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-#
-#
-
-output "values" {
-  value = data.template_file.gitpod_values_database.rendered
-}
-
-output "done" {
-  value = null_resource.done.id
-}
diff --git a/install/gcp-full-terraform/modules/mysql_gcp/templates/values.tpl b/install/gcp-full-terraform/modules/mysql_gcp/templates/values.tpl
deleted file mode 100644
index 9d3b3b554e60db..00000000000000
--- a/install/gcp-full-terraform/modules/mysql_gcp/templates/values.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Terraform Module: mysql_gcp
-#
-
-db:
-  host: "${host}"
-  password: "${password}"
-
-
-components:
-  db:
-    gcloudSqlProxy:
-      enabled: false
-  
-mysql:
-  enabled: false
diff --git a/install/gcp-full-terraform/modules/mysql_gcp/variables.tf b/install/gcp-full-terraform/modules/mysql_gcp/variables.tf
deleted file mode 100644
index e71a4b9d4eda2d..00000000000000
--- a/install/gcp-full-terraform/modules/mysql_gcp/variables.tf
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Project
-#
-
-variable "project" {
-  type = string
-}
-
-
-
-#
-# Region
-#
-
-variable "region" {
-  type = string
-}
-
-
-
-#
-# Network ID
-#
-
-variable "network" {
-  type = object({
-    id   = string
-    name = string
-  })
-}
-
-variable "subnets" {
-  type = list(string)
-}
-
-variable "serviceaccount" {
-  type    = string
-  default = "gitpod-database"
-}
-
-variable "database" {
-  type = object({
-    version   = string
-    tier      = string
-    disk_type = string
-    disk_size = number
-    charset   = string
-    collation = string
-    tables    = list(string)
-    username  = string
-    name      = string
-  })
-  default = {
-    version   = "MYSQL_5_7"
-    tier      = "db-f1-micro"
-    disk_type = "PD_SSD"
-    disk_size = 10
-    charset   = "utf8mb4"
-    collation = "utf8mb4_bin"
-    tables = [
-      "gitpod",
-      "gitpod-sessions",
-    ]
-    username = "gitpod"
-    name     = "gitpod-database"
-  }
-}
-
-variable "gitpod" {
-  type = object({
-    namespace = string
-  })
-  default = {
-    namespace = "default"
-  }
-}
-
-variable "kubernetes" {
-  type = object({
-    namespace = string
-  })
-  default = {
-    namespace = "default"
-  }
-}
-
-variable "requirements" {
-  type = object({
-    kubernetes = string
-  })
-}
diff --git a/install/gcp-full-terraform/modules/mysql_helm/main.tf b/install/gcp-full-terraform/modules/mysql_helm/main.tf
deleted file mode 100644
index 99aadcea9921cb..00000000000000
--- a/install/gcp-full-terraform/modules/mysql_helm/main.tf
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Resources
-#
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password
-resource "random_password" "gitpod_database_root" {
-  length  = 16
-  special = false
-}
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password
-resource "random_password" "gitpod_database_user" {
-  length  = 16
-  special = false
-}
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id
-resource "random_id" "gitpod_database" {
-  byte_length = 2
-}
-
-# # https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/secret
-# resource "kubernetes_secret" "gitpod_database" {
-#   metadata {
-#     name      = "${var.database.name}-${random_id.gitpod_database.hex}-mysql"
-#     namespace = var.namespace
-#   }
-
-#   data = {
-#     host          = "${var.database.name}-${random_id.gitpod_database.hex}-mysql"
-#     root-password = random_password.gitpod_database_root.result
-#     user          = var.database.username
-#     password      = random_password.gitpod_database_user.result
-#   }
-
-#   # This dependency is added to make sure that the kubernetes cluster is up and running before any kubernetes resource would be deployed
-#   depends_on = [
-#     var.requirements
-#   ]
-# }
-
-
-
-resource "helm_release" "mysql" {
-  name       = "${var.database.name}-${random_id.gitpod_database.hex}"
-  namespace  = var.namespace
-  chart      = var.database.chart
-  repository = var.database.repository
-  version    = var.database.version
-
-  set {
-    name  = "mysqlRootPassword"
-    value = random_password.gitpod_database_root.result
-  }
-
-  set {
-    name  = "mysqlUser"
-    value = var.database.username
-  }
-
-  set {
-    name  = "mysqlPassword"
-    value = random_password.gitpod_database_user.result
-  }
-
-  timeout = "1800"
-
-}
-
-
-resource "kubernetes_job" "mysql_initializer" {
-  metadata {
-    name      = "gitpod-db-initialization"
-    namespace = var.namespace
-  }
-  spec {
-    template {
-      metadata {}
-      spec {
-        container {
-          name    = "db-initialization"
-          image   = "gcr.io/gitpod-io/db-migrations:v0.4.0-dev-selfhosted-gitpod-db-init.15"
-          command = ["/init.sh", "&&", "echo", "finished"]
-          env {
-            name  = "MYSQL_HOST"
-            value = "${var.database.name}-${random_id.gitpod_database.hex}-mysql"
-          }
-          env {
-            name  = "MYSQL_USER"
-            value = "root"
-          }
-          env {
-            name  = "MYSQL_PORT"
-            value = "3306"
-          }
-          env {
-            name = "MYSQL_ROOT_PASSWORD"
-            value_from {
-              secret_key_ref {
-                name = "${var.database.name}-${random_id.gitpod_database.hex}-mysql"
-                key  = "mysql-root-password"
-              }
-            }
-          }
-        }
-        restart_policy = "Never"
-      }
-    }
-    backoff_limit = 4
-  }
-  depends_on = [
-    helm_release.mysql
-  ]
-}
-
-# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
-data "template_file" "gitpod_values_database" {
-  template = file("${path.module}/templates/values.tpl")
-  vars = {
-    host     = "${var.database.name}-${random_id.gitpod_database.hex}-mysql"
-    password = random_password.gitpod_database_root.result
-  }
-}
-
-#
-# End
-#
-
-resource "null_resource" "done" {
-  depends_on = [
-    kubernetes_job.mysql_initializer,
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/mysql_helm/templates/values.tpl b/install/gcp-full-terraform/modules/mysql_helm/templates/values.tpl
deleted file mode 100644
index 2a3e57a97cae9d..00000000000000
--- a/install/gcp-full-terraform/modules/mysql_helm/templates/values.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Terraform Module: mysql_helm
-#
-
-db:
-  host: "${host}"
-  password: "${password}"
-
-
-components:
-  db:
-    gcloudSqlProxy:
-      enabled: false
-  
-mysql:
-  enabled: false
diff --git a/install/gcp-full-terraform/modules/mysql_helm/variables.tf b/install/gcp-full-terraform/modules/mysql_helm/variables.tf
deleted file mode 100644
index 03527ffc1326bd..00000000000000
--- a/install/gcp-full-terraform/modules/mysql_helm/variables.tf
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Project
-#
-
-variable "project" {
-  type = string
-}
-
-variable "name" {
-  type    = string
-  default = "gitpod-database"
-}
-
-variable "namespace" {
-  type    = string
-  default = "default"
-}
-
-variable "database" {
-  type = object({
-    name       = string
-    username   = string
-    chart      = string
-    repository = string
-    version    = string
-  })
-  default = {
-    name       = "gitpod-database"
-    username   = "gitpod"
-    chart      = "mysql"
-    repository = "https://kubernetes-charts.storage.googleapis.com"
-    version    = "1.6.6"
-  }
-}
-
-
-variable "requirements" {
-  type = object({
-    kubernetes = string
-  })
-}
diff --git a/install/gcp-full-terraform/modules/network/README.md b/install/gcp-full-terraform/modules/network/README.md
deleted file mode 100644
index 4f6e6eb1c700bb..00000000000000
--- a/install/gcp-full-terraform/modules/network/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Gitpod: GCP Networking
\ No newline at end of file
diff --git a/install/gcp-full-terraform/modules/network/main.tf b/install/gcp-full-terraform/modules/network/main.tf
deleted file mode 100644
index 43c9314ad23e1f..00000000000000
--- a/install/gcp-full-terraform/modules/network/main.tf
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# GCP Region
-#
-
-data "google_compute_zones" "available" {
-  project = var.project
-  region  = var.region
-}
-
-
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id
-resource "random_id" "gitpod" {
-  byte_length = 2
-}
-
-
-
-#
-# VPC Network
-#
-
-resource "google_compute_network" "gitpod" {
-  name                    = "${var.name}-${random_id.gitpod.hex}"
-  description             = "Gitpod Cluster Network"
-  auto_create_subnetworks = false
-}
-
-
-
-#
-# VPC Subnetworks
-#
-
-resource "google_compute_subnetwork" "gitpod" {
-  count                    = length(data.google_compute_zones.available.names)
-  name                     = "${google_compute_network.gitpod.name}-${random_id.gitpod.hex}-${count.index}"
-  ip_cidr_range            = "10.${count.index}.0.0/16"
-  region                   = var.region
-  network                  = google_compute_network.gitpod.id
-  private_ip_google_access = true
-}
-
-
-#
-# End
-#
-
-resource "null_resource" "done" {
-  depends_on = [
-    google_compute_subnetwork.gitpod
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/network/outputs.tf b/install/gcp-full-terraform/modules/network/outputs.tf
deleted file mode 100644
index b47f2b05df987c..00000000000000
--- a/install/gcp-full-terraform/modules/network/outputs.tf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Google Compute Network
-#
-
-output "vpc" {
-  value = google_compute_network.gitpod
-}
-
-output "subnets" {
-  value = google_compute_subnetwork.gitpod
-}
-
-output "done" {
-  value = null_resource.done.id
-}
diff --git a/install/gcp-full-terraform/modules/network/variables.tf b/install/gcp-full-terraform/modules/network/variables.tf
deleted file mode 100644
index d6dea6f2bce938..00000000000000
--- a/install/gcp-full-terraform/modules/network/variables.tf
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Project
-#
-
-variable "project" {
-  type = string
-}
-
-
-
-#
-# Region
-#
-
-variable "region" {
-  type = string
-}
-
-
-
-#
-# Network Name
-#
-
-variable "name" {
-  type    = string
-  default = "vpc-gitpod"
-}
diff --git a/install/gcp-full-terraform/modules/registry/README.md b/install/gcp-full-terraform/modules/registry/README.md
deleted file mode 100644
index da8ef3c724c998..00000000000000
--- a/install/gcp-full-terraform/modules/registry/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Gitpod: Google Container Registry
\ No newline at end of file
diff --git a/install/gcp-full-terraform/modules/registry/main.tf b/install/gcp-full-terraform/modules/registry/main.tf
deleted file mode 100644
index f5f7c0aeda1e76..00000000000000
--- a/install/gcp-full-terraform/modules/registry/main.tf
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Enable Service APIs
-#
-
-# # https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_service
-# resource "google_project_service" "gitpod_registry" {
-#   count   = length(local.google_services)
-#   project = var.project
-#   service = local.google_services[count.index]
-
-#   disable_dependent_services = false
-
-# }
-
-
-
-#
-# Service Account
-#
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id
-resource "random_id" "gitpod_registry" {
-  byte_length = 2
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_service_account
-resource "google_service_account" "gitpod_registry" {
-  account_id   = "gitpod-registry-${random_id.gitpod_registry.hex}"
-  display_name = "gitpod-registry-full"
-  description  = "Gitpod Registry Admin"
-  project      = var.project
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_iam_custom_role
-resource "google_project_iam_custom_role" "gitpod_registry" {
-  role_id     = "gitpod.registry"
-  title       = "Gitpod Registry"
-  description = "Gitpod Registry Role"
-  permissions = [
-    "storage.buckets.create",
-    "storage.buckets.delete",
-    "storage.buckets.get",
-    "storage.buckets.getIamPolicy",
-    "storage.buckets.list",
-    "storage.buckets.setIamPolicy",
-    "storage.buckets.update",
-    "storage.objects.create",
-    "storage.objects.delete",
-    "storage.objects.get",
-    "storage.objects.getIamPolicy",
-    "storage.objects.list",
-    "storage.objects.setIamPolicy",
-    "storage.objects.update",
-  ]
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_iam
-resource "google_project_iam_binding" "gitpod_registry" {
-  project = var.project
-  role    = google_project_iam_custom_role.gitpod_registry.id
-  members = [
-    "serviceAccount:${google_service_account.gitpod_registry.email}"
-  ]
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_service_account_key
-resource "google_service_account_key" "gitpod_registry" {
-  service_account_id = google_service_account.gitpod_registry.name
-}
-
-
-
-#
-# registry-auth
-#
-
-# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
-data "template_file" "gitpod_registry_auth" {
-  template = file("${path.module}/templates/registry-auth.tpl")
-  vars = {
-    hostname = var.hostname
-    auth     = base64encode("_json_key: ${base64decode(google_service_account_key.gitpod_registry.private_key)}")
-  }
-}
-
-# https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/secret
-resource "kubernetes_secret" "gitpod_registry_auth" {
-  metadata {
-    name      = "gitpod-registry-${random_id.gitpod_registry.hex}"
-    namespace = var.gitpod.namespace
-  }
-
-  data = {
-    ".dockerconfigjson" = data.template_file.gitpod_registry_auth.rendered
-  }
-
-  type = "kubernetes.io/dockerconfigjson"
-
-  depends_on = [
-    var.requirements
-  ]
-
-}
-
-# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
-data "template_file" "gitpod_values_registry" {
-  template = file("${path.module}/templates/values.tpl")
-  vars = {
-    hostname    = var.hostname
-    project     = var.project
-    secret_name = kubernetes_secret.gitpod_registry_auth.metadata[0].name
-  }
-}
-
-
-
-#
-# End
-#
-
-resource "null_resource" "done" {
-  depends_on = [
-    kubernetes_secret.gitpod_registry_auth
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/registry/outputs.tf b/install/gcp-full-terraform/modules/registry/outputs.tf
deleted file mode 100644
index 3e649e7ab5b5a0..00000000000000
--- a/install/gcp-full-terraform/modules/registry/outputs.tf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Gitpod Helm values.yaml
-#
-
-output "values" {
-  value = data.template_file.gitpod_values_registry.rendered
-}
-
-output "done" {
-  value = null_resource.done.id
-}
diff --git a/install/gcp-full-terraform/modules/registry/templates/registry-auth.tpl b/install/gcp-full-terraform/modules/registry/templates/registry-auth.tpl
deleted file mode 100644
index 053e8f36fab6ff..00000000000000
--- a/install/gcp-full-terraform/modules/registry/templates/registry-auth.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"auths": {
-		"${hostname}": {
-			"auth": "${auth}"
-		}
-	}
-}
\ No newline at end of file
diff --git a/install/gcp-full-terraform/modules/registry/templates/values.tpl b/install/gcp-full-terraform/modules/registry/templates/values.tpl
deleted file mode 100644
index 98f29add50469d..00000000000000
--- a/install/gcp-full-terraform/modules/registry/templates/values.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-components:
-  imageBuilder:
-    registryCerts: []
-    registry:
-      name: "${hostname}/${project}"
-      secretName: ${secret_name}
-
-  workspace:
-    pullSecret:
-      secretName: ${secret_name}
-
-docker-registry:
-  enabled: false
-
-gitpod_selfhosted:
-  variants:
-    customRegistry: true
diff --git a/install/gcp-full-terraform/modules/storage/locals.tf b/install/gcp-full-terraform/modules/storage/locals.tf
deleted file mode 100644
index 515d0ce704442c..00000000000000
--- a/install/gcp-full-terraform/modules/storage/locals.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-locals {
-  google_services = [
-    "storage-api.googleapis.com",
-    "storage-component.googleapis.com",
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/storage/main.tf b/install/gcp-full-terraform/modules/storage/main.tf
deleted file mode 100644
index c14def4b0ae369..00000000000000
--- a/install/gcp-full-terraform/modules/storage/main.tf
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Enable Service APIs
-#
-
-# # https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_service
-# resource "google_project_service" "gitpod_storage" {
-#   count   = length(local.google_services)
-#   project = var.project
-#   service = local.google_services[count.index]
-
-#   disable_dependent_services = false
-
-# }
-
-
-
-#
-# Service Account
-#
-
-# https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id
-resource "random_id" "gitpod_storage" {
-  byte_length = 2
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_service_account
-resource "google_service_account" "gitpod_storage" {
-  account_id   = "gitpod-workspace-syncer-${random_id.gitpod_storage.hex}"
-  display_name = "gitpod-workspace-syncer"
-  description  = "gitpod-workspace-syncer"
-  project      = var.project
-}
-
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/iam_role
-data "google_iam_role" "gitpod_storage_storage_admin_roleinfo" {
-  name = "roles/storage.admin"
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/iam_role
-data "google_iam_role" "gitpod_storage_object_admin_roleinfo" {
-  name = "roles/storage.objectAdmin"
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_iam_custom_role
-resource "google_project_iam_custom_role" "gitpod_storage" {
-  role_id     = "gitpod.storage.${random_id.gitpod_storage.hex}"
-  title       = "Gitpod Storage ${random_id.gitpod_storage.hex}"
-  description = "Gitpod Storage Role ${random_id.gitpod_storage.hex}"
-  permissions = [
-    "storage.buckets.create",
-    "storage.buckets.delete",
-    "storage.buckets.get",
-    "storage.buckets.getIamPolicy",
-    "storage.buckets.list",
-    "storage.buckets.setIamPolicy",
-    "storage.buckets.update",
-    "storage.objects.create",
-    "storage.objects.delete",
-    "storage.objects.get",
-    "storage.objects.getIamPolicy",
-    "storage.objects.list",
-    "storage.objects.setIamPolicy",
-    "storage.objects.update",
-  ]
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_iam
-resource "google_project_iam_binding" "gitpod_storage" {
-  project = var.project
-  role    = google_project_iam_custom_role.gitpod_storage.id
-  members = [
-    "serviceAccount:${google_service_account.gitpod_storage.email}"
-  ]
-}
-
-# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_service_account_key
-resource "google_service_account_key" "gitpod_storage" {
-  service_account_id = google_service_account.gitpod_storage.name
-}
-
-
-#
-# Kubernetes Resources
-#
-
-# https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/secret
-resource "kubernetes_secret" "gitpod_storage" {
-  metadata {
-    name      = "gitpod-storage-${random_id.gitpod_storage.hex}"
-    namespace = var.gitpod.namespace
-  }
-
-  data = {
-    "key.json" = base64decode(google_service_account_key.gitpod_storage.private_key)
-  }
-
-  depends_on = [
-    var.requirements,
-  ]
-
-}
-
-
-
-#
-# values.yaml
-#
-
-# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
-data "template_file" "gitpod_storage_values" {
-  template = file("${path.module}/templates/values.tpl")
-  vars = {
-    project     = var.project
-    region      = var.region
-    secret_name = "gitpod-storage-${random_id.gitpod_storage.hex}"
-  }
-}
-
-
-
-#
-# End
-#
-
-resource "null_resource" "done" {
-  depends_on = [
-    kubernetes_secret.gitpod_storage
-  ]
-}
diff --git a/install/gcp-full-terraform/modules/storage/outputs.tf b/install/gcp-full-terraform/modules/storage/outputs.tf
deleted file mode 100644
index afc4432c5a4d67..00000000000000
--- a/install/gcp-full-terraform/modules/storage/outputs.tf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-#
-#
-
-output "values" {
-  value = data.template_file.gitpod_storage_values.rendered
-}
-
-output "done" {
-  value = null_resource.done.id
-}
diff --git a/install/gcp-full-terraform/modules/storage/templates/values.tpl b/install/gcp-full-terraform/modules/storage/templates/values.tpl
deleted file mode 100644
index a74c4603cc0d96..00000000000000
--- a/install/gcp-full-terraform/modules/storage/templates/values.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-components:
-  wsDaemon:
-    volumes:
-    - name: gcloud-creds
-      secret:
-        secretName: ${secret_name}
-    - name: gcloud-tmp
-      hostPath:
-        path: /mnt/disks/ssd0/sync-tmp
-        type: DirectoryOrCreate
-    volumeMounts:
-    - mountPath: /credentials
-      name: gcloud-creds
-    - mountPath: /mnt/sync-tmp
-      name: gcloud-tmp
-    remoteStorage:
-      kind: gcloud
-      gcloud:
-        # You need to set your GCP project ID here.
-        # Beware: the name of your project is not the same as its ID. You can find the project ID under the "Home" page of your GCP project.
-        projectId: ${project}
-        # The GCP region you want the workspace content to be stored in. This should ideally be in the same region as your cluster.
-        region: ${region}
-        # You shouldn't have to change the values below if you're using the templates that ship with this chart.
-        credentialsFile: /credentials/key.json
-        tmpdir: /mnt/sync-tmp
-        parallelUpload: 6
-  server:
-    storage:
-      secretName: ${secret_name}
-      keyFilePath: key.json
-minio:
-  enabled: false
\ No newline at end of file
diff --git a/install/gcp-full-terraform/modules/storage/variables.tf b/install/gcp-full-terraform/modules/storage/variables.tf
deleted file mode 100644
index 34b46e2852e55f..00000000000000
--- a/install/gcp-full-terraform/modules/storage/variables.tf
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Project
-#
-
-variable "project" {
-  type = string
-}
-
-
-
-#
-# Region
-#
-
-variable "region" {
-  type = string
-}
-
-
-
-#
-# Location
-#
-
-variable "location" {
-  type    = string
-  default = "EU"
-}
-
-
-variable "name" {
-  type    = string
-  default = "gitpod-storage"
-}
-
-
-
-#
-# Kubernetes
-#
-variable "gitpod" {
-  type = object({
-    namespace = string
-  })
-  default = {
-    namespace = "default"
-  }
-}
-
-
-variable "minio_access_key" {
-  type    = string
-  default = "minio"
-}
-
-
-variable "kubernetes" {
-  type = object({
-    enabled   = bool
-    namespace = string
-  })
-  default = {
-    enabled   = true
-    namespace = "default"
-  }
-}
-
-
-variable "requirements" {
-  type = object({
-    kubernetes = string
-  })
-}
diff --git a/install/gcp-full-terraform/outputs.tf b/install/gcp-full-terraform/outputs.tf
deleted file mode 100644
index 8f82db90711532..00000000000000
--- a/install/gcp-full-terraform/outputs.tf
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-#
-#
-
-output "network" {
-  value = module.network
-}
-
-# output "kubernetes" {
-#   value = module.kubernetes
-# }
-
-# output "dns" {
-#   value = module.dns
-# }
-
-# output "storage" {
-#   value = yamldecode(module.storage.values)
-# }
-
-# output "database" {
-#   value = yamldecode(module.database.values)
-# }
-
-# output "registry" {
-#   value = yamldecode(module.registry.values)
-# }
-
-# output "https" {
-#   value = module.https
-# }
diff --git a/install/gcp-full-terraform/provider.tf b/install/gcp-full-terraform/provider.tf
deleted file mode 100644
index 15308b4954e6e8..00000000000000
--- a/install/gcp-full-terraform/provider.tf
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Provider
-#
-
-
-#
-# Google
-#
-
-provider "google" {
-  project = var.project
-  region  = var.region
-}
-
-
-
-#
-# Kubernetes
-#
-
-provider "kubernetes" {
-  load_config_file = "false"
-
-  host                   = module.kubernetes.cluster.endpoint
-  username               = module.kubernetes.cluster.master_auth[0].username
-  password               = module.kubernetes.cluster.master_auth[0].password
-  client_certificate     = base64decode(module.kubernetes.cluster.master_auth[0].client_certificate)
-  client_key             = base64decode(module.kubernetes.cluster.master_auth[0].client_key)
-  cluster_ca_certificate = base64decode(module.kubernetes.cluster.master_auth[0].cluster_ca_certificate)
-}
-
-
-
-#
-# Helm
-#
-
-provider "helm" {
-  kubernetes {
-    load_config_file = "false"
-
-    host                   = module.kubernetes.cluster.endpoint
-    username               = module.kubernetes.cluster.master_auth[0].username
-    password               = module.kubernetes.cluster.master_auth[0].password
-    client_certificate     = base64decode(module.kubernetes.cluster.master_auth[0].client_certificate)
-    client_key             = base64decode(module.kubernetes.cluster.master_auth[0].client_key)
-    cluster_ca_certificate = base64decode(module.kubernetes.cluster.master_auth[0].cluster_ca_certificate)
-  }
-}
diff --git a/install/gcp-full-terraform/templates/values.tpl b/install/gcp-full-terraform/templates/values.tpl
deleted file mode 100644
index 4d277f65495711..00000000000000
--- a/install/gcp-full-terraform/templates/values.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Auth Provider
-#
-
-authProviders:
-  - id: "Public-GitHub"
-    host: "github.com"
-    type: "GitHub"
-    oauth:
-      clientId: "CLIENT_ID"
-      clientSecret: "CLIENT_SECRET"
-      callBackUrl: "https://your-domain.com/auth/github/callback"
-      settingsUrl: "https://github.com/settings/connections/applications/CLIENT_ID"
-    description: ""
-    icon: ""
-  - id: "Public-GitLab"
-    host: "gitlab.com"
-    type: "GitLab"
-    oauth:
-      clientId: "CLIENT_ID"
-      clientSecret: "CLIENT_SECRET"
-      callBackUrl: "https://gitpod.io/auth/gitlab/callback"
-      settingsUrl: "https://gitlab.com/profile/applications"
-    description: ""
-    icon: ""
-
-#
-# Branding
-#
-
-branding:
-  logo: /images/gitpod-ddd.svg
-  homepage: https://www.gitpod.io/
-  links:
-    header:
-      - name: Workspaces
-        url: /workspaces/
-      - name: Docs
-        url: https://www.gitpod.io/docs/
-      - name: Blog
-        url: https://www.gitpod.io/blog/
-      - name: Community
-        url: https://community.gitpod.io/
-    footer:
-      - name: Docs
-        url: https://www.gitpod.io/docs/
-      - name: Blog
-        url: https://www.gitpod.io/blog/
-      - name: Status
-        url: https://status.gitpod.io/
-    social:
-      - type: GitHub
-        url: https://github.com/gitpod-io/gitpod
-      - type: Discourse
-        url: https://community.gitpod.io/
-      - type: Twitter
-        url: https://twitter.com/gitpod
-    legal:
-      - name: Imprint
-        url: https://www.gitpod.io/imprint/
-      - name: Privacy Policy
-        url: https://www.gitpod.io/privacy/
-      - name: Terms of Service
-        url: https://www.gitpod.io/terms/
diff --git a/install/gcp-terraform/BUILD.yaml b/install/gcp-terraform/BUILD.yaml
deleted file mode 100644
index 6105c3e29f9128..00000000000000
--- a/install/gcp-terraform/BUILD.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
-# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
-
-packages:
-  - name: lib
-    type: generic
-    deps:
-      - :test
-    srcs:
-      - "**/*.tf"
-      - "**/*.tfvars"
-      - "**/*.yaml"
-      - "**/*.md"
-      - "**/*.tpl"
-    config:
-      commands:
-        - ["echo"]
-  - name: test
-    type: generic
-    srcs:
-      - "**/*.tf"
-      - "**/*.tfvars"
-      - "**/*.yaml"
-      - "**/*.md"
-      - "**/*.tpl"
-    config:
-      commands:
-        - ["terraform", "init", "-backend=false"]
-        - ["terraform", "fmt", "-recursive", "-check"]
-        - ["terraform", "validate"]
\ No newline at end of file
diff --git a/install/gcp-terraform/environment/full/.gitignore b/install/gcp-terraform/environment/full/.gitignore
new file mode 100644
index 00000000000000..8312d18633ff92
--- /dev/null
+++ b/install/gcp-terraform/environment/full/.gitignore
@@ -0,0 +1,3 @@
+*.auto.tfvars
+certificates/**
+secrets/**
\ No newline at end of file
diff --git a/install/gcp-full-terraform/README.md b/install/gcp-terraform/environment/full/README.md
similarity index 100%
rename from install/gcp-full-terraform/README.md
rename to install/gcp-terraform/environment/full/README.md
diff --git a/install/gcp-terraform/environment/full/main.tf b/install/gcp-terraform/environment/full/main.tf
new file mode 100644
index 00000000000000..8dc354b182d904
--- /dev/null
+++ b/install/gcp-terraform/environment/full/main.tf
@@ -0,0 +1,131 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+
+resource "google_compute_network" "gitpod" {
+  name                    = "gitpod"
+  description             = "Gitpod Cluster Network"
+  auto_create_subnetworks = false
+  project                 = var.project
+}
+
+module "kubernetes" {
+  source = "../../modules/kubernetes"
+
+  name    = "gitpod"
+  network = google_compute_network.gitpod.name
+  project = var.project
+  region  = var.region
+}
+
+
+module "kubeconfig" {
+  source = "../../modules/kubeconfig"
+
+  cluster = {
+    name = "gitpod"
+  }
+
+  depends_on = [
+    module.kubernetes
+  ]
+}
+
+module "dns" {
+  source = "../../modules/dns"
+
+  project   = var.project
+  region    = var.region
+  zone_name = var.zone_name
+  name      = "gitpod-dns"
+  subdomain = var.subdomain
+
+  providers = {
+    google     = google
+    kubernetes = kubernetes
+  }
+}
+
+
+module "certmanager" {
+  source = "../../modules/certmanager"
+
+  project = var.project
+  email   = var.certificate_email
+  domain  = module.dns.hostname
+
+  providers = {
+    google     = google
+    kubernetes = kubernetes
+    helm       = helm
+    kubectl    = kubectl
+  }
+}
+
+module "registry" {
+  source = "../../modules/registry"
+
+  name     = var.subdomain
+  project  = var.project
+  location = var.container_registry.location
+
+  providers = {
+    google     = google
+    kubernetes = kubernetes
+  }
+}
+
+
+module "storage" {
+  source = "../../modules/storage"
+
+  name     = var.subdomain
+  project  = var.project
+  region   = var.region
+  location = "EU"
+}
+
+module "database" {
+  source = "../../modules/database"
+
+  project = var.project
+  name    = var.database.name
+  region  = var.region
+  network = {
+    id   = google_compute_network.gitpod.id
+    name = google_compute_network.gitpod.name
+  }
+}
+
+#
+# Gitpod
+#
+
+module "gitpod" {
+  source = "../../modules/gitpod"
+
+  project            = var.project
+  region             = var.region
+  namespace          = var.namespace
+  values             = file("values.yaml")
+  dns_values         = module.dns.values
+  certificate_values = module.certmanager.values
+  database_values    = module.database.values
+  registry_values    = module.registry.values
+  storage_values     = module.storage.values
+  license            = var.license
+
+  gitpod = {
+    chart        = "../../../../chart"
+    image_prefix = "gcr.io/gitpod-io/self-hosted/"
+    version      = "0.6.0-beta1"
+  }
+
+  providers = {
+    google     = google
+    kubernetes = kubernetes
+    helm       = helm
+  }
+}
diff --git a/install/gcp-terraform/environment/full/providers.tf b/install/gcp-terraform/environment/full/providers.tf
new file mode 100644
index 00000000000000..147c6d9143b0e4
--- /dev/null
+++ b/install/gcp-terraform/environment/full/providers.tf
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+provider "google" {
+  project = var.project
+  region  = var.region
+}
+
+data "google_client_config" "provider" {}
+
+provider "kubernetes" {
+  load_config_file = "false"
+
+  host                   = module.kubernetes.cluster.endpoint
+  token                  = data.google_client_config.provider.access_token
+  cluster_ca_certificate = base64decode(module.kubernetes.cluster.master_auth[0].cluster_ca_certificate)
+}
+
+provider "helm" {
+  kubernetes {
+    load_config_file = "false"
+
+    host                   = module.kubernetes.cluster.endpoint
+    token                  = data.google_client_config.provider.access_token
+    cluster_ca_certificate = base64decode(module.kubernetes.cluster.master_auth[0].cluster_ca_certificate)
+  }
+}
+
+provider "kubectl" {
+  load_config_file = "false"
+
+  host                   = module.kubernetes.cluster.endpoint
+  token                  = data.google_client_config.provider.access_token
+  cluster_ca_certificate = base64decode(module.kubernetes.cluster.master_auth[0].cluster_ca_certificate)
+}
diff --git a/install/gcp-terraform/environment/full/values.yaml b/install/gcp-terraform/environment/full/values.yaml
new file mode 100644
index 00000000000000..4e24bf460497cc
--- /dev/null
+++ b/install/gcp-terraform/environment/full/values.yaml
@@ -0,0 +1,11 @@
+ingressMode: noDomain
+certificatesSecret: {}
+
+components:
+  wsProxy:
+    ingress:
+      portRange:
+        start: 10000
+        end: 11000
+
+authProviders: []
\ No newline at end of file
diff --git a/install/gcp-full-terraform/variables.tf b/install/gcp-terraform/environment/full/variables.tf
similarity index 67%
rename from install/gcp-full-terraform/variables.tf
rename to install/gcp-terraform/environment/full/variables.tf
index 7af1180168e3f9..1638afbac294cc 100644
--- a/install/gcp-full-terraform/variables.tf
+++ b/install/gcp-terraform/environment/full/variables.tf
@@ -3,6 +3,7 @@
  * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
  */
 
+
 variable "project" {
   type = string
 }
@@ -17,26 +18,34 @@ variable "container_registry" {
   })
 }
 
-variable "dns_name" {
-  type        = string
-  description = "domain at which the installation will be available"
+variable "zone_name" {
+  type = string
 }
 
-variable "kubernetes" {
-  type = object({
-    namespace = string
-  })
-  default = {
-    namespace = "default"
-  }
+variable "namespace" {
+  type    = string
+  default = "default"
 }
 
 variable "certificate_email" {
   type = string
 }
 
-
 variable "license" {
   type    = string
   default = ""
 }
+
+variable "database" {
+  type = object({
+    name = string
+  })
+  default = {
+    name = "db"
+  }
+}
+
+variable "subdomain" {
+  type    = string
+  default = "gitpod"
+}
diff --git a/install/gcp-terraform/environment/full/versions.tf b/install/gcp-terraform/environment/full/versions.tf
new file mode 100644
index 00000000000000..a6ee0ded054aa5
--- /dev/null
+++ b/install/gcp-terraform/environment/full/versions.tf
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    google = {
+      source = "hashicorp/google"
+    }
+    kubernetes = {
+      source = "hashicorp/kubernetes"
+    }
+    helm = {
+      source = "hashicorp/helm"
+    }
+    kubectl = {
+      source  = "gavinbunney/kubectl"
+      version = "1.9.4"
+    }
+  }
+}
diff --git a/install/gcp-terraform/.gitignore b/install/gcp-terraform/environment/installer/.gitignore
similarity index 100%
rename from install/gcp-terraform/.gitignore
rename to install/gcp-terraform/environment/installer/.gitignore
diff --git a/install/gcp-full-terraform/BUILD.yaml b/install/gcp-terraform/environment/installer/BUILD.yaml
similarity index 93%
rename from install/gcp-full-terraform/BUILD.yaml
rename to install/gcp-terraform/environment/installer/BUILD.yaml
index 728609b2e14843..f07c7aa2746852 100644
--- a/install/gcp-full-terraform/BUILD.yaml
+++ b/install/gcp-terraform/environment/installer/BUILD.yaml
@@ -6,10 +6,10 @@ packages:
     type: generic
     srcs:
       - "**/*.tf"
-      - "**/*.tfvars_"
+      - "**/*.tfvars"
+      - "**/*.tpl"
       - "**/*.yaml"
       - "**/*.md"
-      - "**/*.tpl"
     config:
       commands:
         - ["echo"]
diff --git a/install/gcp-terraform/main.auto.tfvars b/install/gcp-terraform/environment/installer/main.auto.tfvars
similarity index 100%
rename from install/gcp-terraform/main.auto.tfvars
rename to install/gcp-terraform/environment/installer/main.auto.tfvars
diff --git a/install/gcp-terraform/environment/installer/main.tf b/install/gcp-terraform/environment/installer/main.tf
new file mode 100644
index 00000000000000..fc4cd5ee0c806e
--- /dev/null
+++ b/install/gcp-terraform/environment/installer/main.tf
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+
+resource "google_compute_network" "gitpod" {
+  name                    = "gitpod"
+  description             = "Gitpod Cluster Network"
+  auto_create_subnetworks = false
+  project                 = var.project
+}
+
+module "kubernetes" {
+  source = "./modules/kubernetes"
+
+  name    = "gitpod"
+  network = google_compute_network.gitpod.name
+  project = var.project
+  region  = var.region
+}
+
+module "registry" {
+  source = "./modules/registry"
+
+  name     = "gitpod"
+  project  = var.project
+  location = "EU"
+
+  providers = {
+    google     = google
+    kubernetes = kubernetes
+  }
+}
+
+module "storage" {
+  source = "./modules/storage"
+
+  name     = "gitpod"
+  project  = var.project
+  region   = var.region
+  location = "EU"
+}
+
+resource "google_compute_address" "gitpod" {
+  name = "gitpod-static-ip"
+
+  project = var.project
+  region  = var.region
+}
+
+locals {
+  hostname = "${var.domain == "" ? local.mygitpod_domain : var.domain}"
+  mygitpod_prefix = replace(google_compute_address.gitpod.address,".","-")
+  mygitpod_domain = "${local.mygitpod_prefix}.ip.mygitpod.com"
+}
+
+data "template_file" "values" {
+  template = file("${path.cwd}/templates/values.tpl")
+  vars = {
+    hostname        = local.hostname
+    loadbalancer_ip = google_compute_address.gitpod.address
+    certbot_enabled = var.certbot_enabled
+    certbot_email   = var.certificate_email
+    force_https     = var.force_https
+  }
+}
+module "gitpod" {
+  source = "./modules/gitpod"
+
+  project = var.project
+  region  = var.region
+  namespace = var.kubernetes.namespace
+  gitpod = {
+    chart        = var.chart_location
+    image_prefix = var.image_prefix
+    version      = var.image_version
+  }
+  values          = data.template_file.values.rendered
+  registry_values = module.registry.values
+  storage_values  = module.storage.values
+
+  providers = {
+    google     = google
+    kubernetes = kubernetes
+    helm       = helm
+  }
+}
diff --git a/install/gcp-terraform/environment/installer/modules b/install/gcp-terraform/environment/installer/modules
new file mode 120000
index 00000000000000..8b0e8540076d9f
--- /dev/null
+++ b/install/gcp-terraform/environment/installer/modules
@@ -0,0 +1 @@
+../../modules
\ No newline at end of file
diff --git a/install/gcp-terraform/outputs.tf b/install/gcp-terraform/environment/installer/outputs.tf
similarity index 65%
rename from install/gcp-terraform/outputs.tf
rename to install/gcp-terraform/environment/installer/outputs.tf
index ce970b61325f0f..467e6047a275c8 100644
--- a/install/gcp-terraform/outputs.tf
+++ b/install/gcp-terraform/environment/installer/outputs.tf
@@ -5,9 +5,9 @@
 
 
 output "public_ip" {
-  value = module.network.static_ip
+  value = google_compute_address.gitpod.address
 }
 
-output "cluster_name" {
-  value = module.kubernetes.cluster.name
+output "hostname" {
+  value = local.hostname
 }
diff --git a/install/gcp-terraform/environment/installer/providers.tf b/install/gcp-terraform/environment/installer/providers.tf
new file mode 100644
index 00000000000000..154bd0342b297b
--- /dev/null
+++ b/install/gcp-terraform/environment/installer/providers.tf
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+provider "google" {
+  project = var.project
+  region  = var.region
+}
+
+data "google_client_config" "provider" {}
+
+provider "kubernetes" {
+  load_config_file = "false"
+
+  host                   = module.kubernetes.cluster.endpoint
+  token                  = data.google_client_config.provider.access_token
+  cluster_ca_certificate = base64decode(module.kubernetes.cluster.master_auth[0].cluster_ca_certificate)
+}
+
+provider "helm" {
+  kubernetes {
+    load_config_file = "false"
+
+    host                   = module.kubernetes.cluster.endpoint
+    token                  = data.google_client_config.provider.access_token
+    cluster_ca_certificate = base64decode(module.kubernetes.cluster.master_auth[0].cluster_ca_certificate)
+  }
+}
diff --git a/install/gcp-terraform/environment/installer/templates/values.tpl b/install/gcp-terraform/environment/installer/templates/values.tpl
new file mode 100644
index 00000000000000..0e644602dfe789
--- /dev/null
+++ b/install/gcp-terraform/environment/installer/templates/values.tpl
@@ -0,0 +1,18 @@
+hostname: ${hostname}
+components:
+    proxy:
+        loadBalancerIP: ${loadbalancer_ip}
+        certbot:
+            enabled: ${certbot_enabled}
+            email: ${certbot_email}
+    wsProxy:
+        disabled: false
+        ingress:
+            portRange:
+                start: 10000
+                end: 11000
+
+installPodSecurityPolicies: true
+ingressMode: pathAndHost
+forceHTTPS: ${force_https}
+authProviders: []
diff --git a/install/gcp-terraform/variables.tf b/install/gcp-terraform/environment/installer/variables.tf
similarity index 93%
rename from install/gcp-terraform/variables.tf
rename to install/gcp-terraform/environment/installer/variables.tf
index 84a23c1a253d36..4fa0a6152b490a 100644
--- a/install/gcp-terraform/variables.tf
+++ b/install/gcp-terraform/environment/installer/variables.tf
@@ -13,6 +13,7 @@ variable "region" {
 
 variable "domain" {
   type        = string
+  default     = "ip.mygitpod.com"
   description = "domain at which the installation will be available"
 }
 
@@ -28,7 +29,7 @@ variable "kubernetes" {
 
 variable "chart_location" {
   type    = string
-  default = "../../chart"
+  default = "../../../../chart"
 }
 
 variable "image_version" {
diff --git a/install/gcp-terraform/main.tf b/install/gcp-terraform/main.tf
deleted file mode 100644
index 32473620eaefad..00000000000000
--- a/install/gcp-terraform/main.tf
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-
-module "network" {
-  source = "./modules/network"
-
-  project = var.project
-  region  = var.region
-  name    = "vpc-gitpod"
-}
-
-module "kubernetes" {
-  requirements = {
-    network = module.network.done
-  }
-
-  source = "./modules/kubernetes"
-
-  name     = "gitpod-cluster"
-  project  = var.project
-  location = var.region
-  network  = module.network.vpc.name
-}
-
-module "registry" {
-  requirements = {
-    kubernetes = module.kubernetes.done
-  }
-
-  source = "./modules/registry"
-
-  project  = var.project
-  hostname = "eu.gcr.io"
-}
-
-module "storage" {
-  requirements = {
-    kubernetes = module.kubernetes.done
-  }
-
-  source = "./modules/storage"
-
-  project = var.project
-  region  = var.region
-}
-
-data "template_file" "gitpod_values" {
-  template = file("${path.root}/templates/values.tpl")
-  vars     = {}
-}
-
-module "helm" {
-  source = "./modules/helm"
-
-  project = var.project
-  region  = var.region
-  kubernetes = {
-    namespace = var.kubernetes.namespace
-  }
-  hostname       = var.domain
-  loadBalancerIP = module.network.static_ip
-  path           = "${path.root}/${var.chart_location}"
-  values = [
-    data.template_file.gitpod_values.rendered,
-    module.storage.values,
-    module.registry.values,
-  ]
-
-  forceHTTPS       = var.force_https
-  certificateEmail = var.certificate_email
-  certbotEnabled   = var.certbot_enabled
-
-  requirements = [
-    module.network.done,
-    module.kubernetes.done,
-    module.storage.done,
-    module.registry.done,
-  ]
-}
diff --git a/install/gcp-terraform/modules/BUILD.yaml b/install/gcp-terraform/modules/BUILD.yaml
new file mode 100644
index 00000000000000..b8029922b8f085
--- /dev/null
+++ b/install/gcp-terraform/modules/BUILD.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+
+packages:
+  - name: installer
+    type: generic
+    srcs:
+      - "gitpod/**/*"
+      - "kubernetes/**/*"
+      - "registry/**/*"
+      - "storage/**/*"
+    config:
+      commands:
+        - ["echo"]
+  - name: all
+    type: generic
+    srcs:
+      - "**/*"
+      - "**/*"
+      - "**/*"
+      - "**/*"
+    config:
+      commands:
+        - ["echo"]
diff --git a/install/gcp-terraform/modules/certmanager/main.tf b/install/gcp-terraform/modules/certmanager/main.tf
new file mode 100644
index 00000000000000..de1f10e76d5782
--- /dev/null
+++ b/install/gcp-terraform/modules/certmanager/main.tf
@@ -0,0 +1,122 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+#
+resource "google_service_account" "certmanager" {
+  account_id   = var.certmanager.name
+  display_name = var.certmanager.name
+  description  = "Cert-Manager Account ${var.certmanager.name}"
+  project      = var.project
+}
+
+# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_iam#google_project_iam_member
+resource "google_project_iam_member" "project" {
+  project = var.project
+  role    = "roles/dns.admin"
+  member  = "serviceAccount:${google_service_account.certmanager.email}"
+}
+
+# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_service_account_key
+resource "google_service_account_key" "certmanager" {
+  service_account_id = google_service_account.certmanager.name
+}
+
+
+#
+# Kubernetes Resources
+#
+
+resource "kubernetes_namespace" "certmanager" {
+  provider = kubernetes
+  metadata {
+    name = var.certmanager.namespace
+  }
+}
+
+#
+resource "kubernetes_secret" "certmanager" {
+  provider = kubernetes
+  metadata {
+    name      = "clouddns-dns01-solver-svc-acct"
+    namespace = kubernetes_namespace.certmanager.metadata[0].name
+  }
+  data = {
+    "credentials.json" = base64decode(google_service_account_key.certmanager.private_key)
+  }
+}
+
+
+# https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release
+resource "helm_release" "certmanager" {
+  name       = var.certmanager.name
+  chart      = var.certmanager.chart
+  repository = var.certmanager.repository
+
+  namespace        = kubernetes_namespace.certmanager.metadata[0].name
+  create_namespace = false
+
+  wait = true
+
+  set {
+    name  = "installCRDs"
+    value = var.certmanager.crds
+  }
+}
+
+locals {
+  clusterissuer = {
+    name     = "letsencrypt-issuer"
+    key_name = "letsencrypt-private-key"
+  }
+}
+
+# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
+data "template_file" "cluster_issuer" {
+  template = file("${path.module}/templates/clusterissuer.tpl")
+
+  vars = {
+    name        = local.clusterissuer.name
+    email       = var.email
+    project     = var.project
+    key_name    = local.clusterissuer.key_name
+    secret_name = kubernetes_secret.certmanager.metadata[0].name
+  }
+}
+
+# https://registry.terraform.io/providers/hashicorp/local/latest/docs/resources/file
+resource "kubectl_manifest" "clusterissuer" {
+  provider  = kubectl
+  yaml_body = data.template_file.cluster_issuer.rendered
+}
+
+
+# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
+data "template_file" "certificate" {
+  template = file("${path.module}/templates/certificate.tpl")
+
+  vars = {
+    name      = var.certificate.name
+    namespace = var.certificate.namespace
+    domain    = var.domain
+  }
+}
+
+# https://registry.terraform.io/providers/hashicorp/local/latest/docs/resources/file
+resource "kubectl_manifest" "certificate" {
+  provider  = kubectl
+  yaml_body = data.template_file.certificate.rendered
+}
+
+
+data "template_file" "values" {
+  template = file("${path.module}/templates/values.tpl")
+
+  vars = {
+    secret_name     = var.certificate.name
+    key_name        = "tls.key"
+    chain_name      = "tls.crt"
+    full_chain_name = "tls.crt"
+  }
+}
\ No newline at end of file
diff --git a/install/gcp-terraform/modules/monitoring/locals.tf b/install/gcp-terraform/modules/certmanager/outputs.tf
similarity index 70%
rename from install/gcp-terraform/modules/monitoring/locals.tf
rename to install/gcp-terraform/modules/certmanager/outputs.tf
index e0c5d6ce99eced..4612fc1403f314 100644
--- a/install/gcp-terraform/modules/monitoring/locals.tf
+++ b/install/gcp-terraform/modules/certmanager/outputs.tf
@@ -3,8 +3,6 @@
  * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
  */
 
-locals {
-  google_services = [
-    "stackdriver.googleapis.com",
-  ]
+output "values" {
+  value = data.template_file.values.rendered
 }
diff --git a/install/gcp-terraform/modules/certmanager/templates/certificate.tpl b/install/gcp-terraform/modules/certmanager/templates/certificate.tpl
new file mode 100644
index 00000000000000..e9d3dafc4fc29b
--- /dev/null
+++ b/install/gcp-terraform/modules/certmanager/templates/certificate.tpl
@@ -0,0 +1,18 @@
+# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+
+apiVersion: cert-manager.io/v1alpha2
+kind: Certificate
+metadata:
+  name: ${name}
+  namespace: ${namespace}
+spec:
+  secretName: ${name}
+  renewBefore: 24h
+  dnsNames:
+    - "${domain}"
+    - "*.${domain}"
+    - "*.ws.${domain}"
+  issuerRef:
+    name: letsencrypt-issuer
+    kind: ClusterIssuer
\ No newline at end of file
diff --git a/install/gcp-full-terraform/modules/https/templates/cert-manager_cluster-issuer.tpl b/install/gcp-terraform/modules/certmanager/templates/clusterissuer.tpl
similarity index 52%
rename from install/gcp-full-terraform/modules/https/templates/cert-manager_cluster-issuer.tpl
rename to install/gcp-terraform/modules/certmanager/templates/clusterissuer.tpl
index c1d435e35a099a..bbf45a037f4c1b 100644
--- a/install/gcp-full-terraform/modules/https/templates/cert-manager_cluster-issuer.tpl
+++ b/install/gcp-terraform/modules/certmanager/templates/clusterissuer.tpl
@@ -1,19 +1,22 @@
-apiVersion: cert-manager.io/v1alpha2
+# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+
+apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
-  name: letsencrypt-issuer
+  name: ${name}
 spec:
   acme:
     server: https://acme-v02.api.letsencrypt.org/directory
     email: "${email}"
     privateKeySecretRef:
-      name: letsencrypt-key
+      name: ${key_name}
     solvers:
       - dns01:
-          clouddns:
+          cloudDNS:
             # The ID of the GCP project
             project: ${project}
             # This is the secret used to access the service account
             serviceAccountSecretRef:
-              name: clouddns-dns01-solver-svc-acct
-              key: key.json
\ No newline at end of file
+              name: ${secret_name}
+              key: credentials.json
diff --git a/install/gcp-terraform/modules/certmanager/templates/values.tpl b/install/gcp-terraform/modules/certmanager/templates/values.tpl
new file mode 100644
index 00000000000000..3420b76d6baf26
--- /dev/null
+++ b/install/gcp-terraform/modules/certmanager/templates/values.tpl
@@ -0,0 +1,5 @@
+certificatesSecret:
+  secretName: ${secret_name}
+  keyName: ${key_name}
+  chainName: ${chain_name}
+  fullChainName: ${full_chain_name}
\ No newline at end of file
diff --git a/install/gcp-full-terraform/modules/https/variables.tf b/install/gcp-terraform/modules/certmanager/variables.tf
similarity index 54%
rename from install/gcp-full-terraform/modules/https/variables.tf
rename to install/gcp-terraform/modules/certmanager/variables.tf
index 4645b1415ac785..6ee96b582ded88 100644
--- a/install/gcp-full-terraform/modules/https/variables.tf
+++ b/install/gcp-terraform/modules/certmanager/variables.tf
@@ -3,53 +3,46 @@
  * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
  */
 
-#
-# Variables
-#
-
 variable "project" {
   type = string
 }
 
-variable "cert_manager" {
+variable "certmanager" {
   type = object({
     name       = string
     namespace  = string
     chart      = string
     repository = string
+    crds_url   = string
+    crds       = bool
   })
   default = {
-    name       = "cert-manger"
-    namespace  = "cert-manager"
+    name       = "certmanger"
+    namespace  = "certmanager"
     chart      = "cert-manager"
+    version    = "v1.1.0"
     repository = "https://charts.jetstack.io"
+    crds_url   = "https://github.com/jetstack/cert-manager/releases/download/v1.1.0/cert-manager.yaml"
+    crds       = true
   }
 }
 
-variable "certificate_email" {
+variable "email" {
   type = string
 }
 
-variable "dns_name" {
+variable "domain" {
   type = string
+
 }
 
-variable "gitpod" {
+variable "certificate" {
   type = object({
+    name      = string
     namespace = string
   })
   default = {
-    namespace = "gitpod"
+    name      = "gitpod-certificate"
+    namespace = "default"
   }
 }
-
-variable "kubeconfig" {
-  type = string
-}
-
-variable "requirements" {
-  type = object({
-    kubernetes = string
-    dns        = string
-  })
-}
diff --git a/install/gcp-terraform/modules/certmanager/versions.tf b/install/gcp-terraform/modules/certmanager/versions.tf
new file mode 100644
index 00000000000000..1623dc61310507
--- /dev/null
+++ b/install/gcp-terraform/modules/certmanager/versions.tf
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+terraform {
+  required_providers {
+    google = {
+      source = "hashicorp/google"
+    }
+    kubernetes = {
+      source = "hashicorp/kubernetes"
+    }
+    helm = {
+      source = "hashicorp/helm"
+    }
+    kubectl = {
+      source = "gavinbunney/kubectl"
+    }
+  }
+}
diff --git a/install/gcp-terraform/modules/database/README.md b/install/gcp-terraform/modules/database/README.md
new file mode 100644
index 00000000000000..a1864eaf2cff6e
--- /dev/null
+++ b/install/gcp-terraform/modules/database/README.md
@@ -0,0 +1,10 @@
+# Module: Database
+
+This module installs the MySQL database instance on GCP.
+
+## Variables
+
+- `project`: Google Project ID, set by default
+- `region`: region in which the Gitpod GKE-Cluster is running
+- `name`: name of the instance on GCP
+- `username`: database username, default: gitpod
diff --git a/install/gcp-terraform/modules/database/main.tf b/install/gcp-terraform/modules/database/main.tf
new file mode 100644
index 00000000000000..f721a9b9c8cf04
--- /dev/null
+++ b/install/gcp-terraform/modules/database/main.tf
@@ -0,0 +1,227 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+locals {
+  google_services = [
+    "sql-component.googleapis.com",
+    "sqladmin.googleapis.com",
+    "servicenetworking.googleapis.com",
+  ]
+}
+
+# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_service
+resource "google_project_service" "database" {
+  count   = length(local.google_services)
+  project = var.project
+  service = local.google_services[count.index]
+
+  disable_dependent_services = false
+  disable_on_destroy         = false
+}
+
+#
+# Network Configuration
+#
+
+resource "google_compute_global_address" "gitpod" {
+  name          = var.name
+  address_type  = "INTERNAL"
+  purpose       = "VPC_PEERING"
+  prefix_length = 16
+  network       = var.network.id
+  project       = var.project
+}
+
+resource "google_service_networking_connection" "gitpod" {
+  network                 = var.network.id
+  service                 = "servicenetworking.googleapis.com"
+  reserved_peering_ranges = [google_compute_global_address.gitpod.name]
+}
+
+
+
+#
+# Google Service Account
+#
+
+resource "google_service_account" "gitpod_database" {
+  account_id   = var.name
+  display_name = var.name
+  description  = "Gitpod Database Account ${var.name}"
+  project      = var.project
+}
+
+resource "google_project_iam_binding" "gitpod_database" {
+  project = var.project
+  role    = "roles/cloudsql.client"
+  members = [
+    "serviceAccount:${google_service_account.gitpod_database.email}"
+  ]
+}
+
+resource "google_service_account_key" "gitpod_database" {
+  service_account_id = google_service_account.gitpod_database.name
+}
+
+resource "random_id" "database" {
+  byte_length = 4
+}
+
+resource "google_sql_database_instance" "gitpod" {
+  name             = "${var.name}-${random_id.database.hex}"
+  region           = var.region
+  database_version = "MYSQL_5_7"
+  settings {
+    tier = "db-f1-micro"
+    ip_configuration {
+      ipv4_enabled    = false
+      private_network = var.network.id
+    }
+  }
+  depends_on = [
+    google_service_networking_connection.gitpod
+  ]
+}
+
+resource "google_sql_database" "gitpod" {
+  name      = "gitpod"
+  instance  = google_sql_database_instance.gitpod.name
+  charset   = "utf8mb4"
+  collation = "utf8mb4_bin"
+}
+
+resource "google_sql_database" "gitpod_sessions" {
+  name      = "gitpod-sessions"
+  instance  = google_sql_database_instance.gitpod.name
+  charset   = "utf8mb4"
+  collation = "utf8mb4_bin"
+}
+
+resource "random_password" "gitpod_db_user" {
+  length           = 16
+  special          = true
+  override_special = "_%@"
+}
+
+resource "google_sql_user" "gitpod" {
+  name     = "gitpod"
+  instance = google_sql_database_instance.gitpod.name
+  host     = "10.%"
+  password = random_password.gitpod_db_user.result
+  project  = var.project
+}
+
+
+
+#
+# Network Peering
+#
+
+resource "google_compute_network_peering_routes_config" "servicenetwork" {
+  peering = "servicenetworking-googleapis-com"
+  network = var.network.name
+
+  import_custom_routes = true
+  export_custom_routes = true
+
+  depends_on = [
+    google_sql_database_instance.gitpod
+  ]
+}
+
+resource "google_compute_network_peering_routes_config" "cloudsql" {
+  peering = "cloudsql-mysql-googleapis-com"
+  network = var.network.name
+
+  import_custom_routes = true
+  export_custom_routes = true
+
+  depends_on = [
+    google_sql_database_instance.gitpod
+  ]
+}
+
+
+resource "kubernetes_secret" "database" {
+  metadata {
+    name      = "gcloud-sql-token"
+    namespace = var.gitpod.namespace
+  }
+
+  data = {
+    "credentials.json" = base64decode(google_service_account_key.gitpod_database.private_key)
+  }
+}
+
+
+resource "kubernetes_secret" "gitpod_database" {
+  metadata {
+    name      = "gitpod-database"
+    namespace = var.gitpod.namespace
+  }
+
+  data = {
+    host     = google_sql_database_instance.gitpod.first_ip_address
+    user     = google_sql_user.gitpod.name
+    password = google_sql_user.gitpod.password
+  }
+}
+
+resource "kubernetes_job" "mysql_initializer" {
+  metadata {
+    name      = "gitpod-db-initialization"
+    namespace = var.gitpod.namespace
+  }
+  spec {
+    template {
+      metadata {}
+      spec {
+        container {
+          name    = "db-initialization"
+          image   = "gcr.io/gitpod-io/db-migrations:v0.4.0-dev-selfhosted-gitpod-db-init.15"
+          command = ["/init.sh", "&&", "echo", "finished"]
+          env {
+            name = "MYSQL_HOST"
+            value_from {
+              secret_key_ref {
+                name = "gitpod-database"
+                key  = "host"
+              }
+            }
+          }
+          env {
+            name  = "MYSQL_USER"
+            value = "gitpod"
+          }
+          env {
+            name  = "MYSQL_PORT"
+            value = "3306"
+          }
+          env {
+            name = "MYSQL_ROOT_PASSWORD"
+            value_from {
+              secret_key_ref {
+                name = "gitpod-database"
+                key  = "password"
+              }
+            }
+          }
+        }
+        restart_policy = "Never"
+      }
+    }
+    backoff_limit = 4
+  }
+}
+
+data "template_file" "values" {
+  template = file("${path.module}/templates/values.tpl")
+  vars = {
+    host        = google_sql_database_instance.gitpod.first_ip_address
+    password    = google_sql_user.gitpod.password
+    instance    = google_sql_database_instance.gitpod.connection_name
+    credentials = kubernetes_secret.database.metadata[0].name
+  }
+}
diff --git a/install/gcp-full-terraform/modules/registry/locals.tf b/install/gcp-terraform/modules/database/outputs.tf
similarity index 68%
rename from install/gcp-full-terraform/modules/registry/locals.tf
rename to install/gcp-terraform/modules/database/outputs.tf
index b1abd9f5560a4b..4612fc1403f314 100644
--- a/install/gcp-full-terraform/modules/registry/locals.tf
+++ b/install/gcp-terraform/modules/database/outputs.tf
@@ -3,11 +3,6 @@
  * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
  */
 
-
-locals {
-
-  google_services = [
-    "containerregistry.googleapis.com"
-  ]
-
+output "values" {
+  value = data.template_file.values.rendered
 }
diff --git a/install/gcp-terraform/modules/database/templates/values.tpl b/install/gcp-terraform/modules/database/templates/values.tpl
new file mode 100644
index 00000000000000..ac0101ea4529a2
--- /dev/null
+++ b/install/gcp-terraform/modules/database/templates/values.tpl
@@ -0,0 +1,20 @@
+# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+
+db:
+  host: "${host}"
+  password: "${password}"
+  port: 3306
+
+components:
+  db:
+    name: db
+    autoMigrate: true
+    gcloudSqlProxy:
+      enabled: true
+      instance: ${instance}
+      credentials: ${credentials}
+    serviceType: ClusterIP
+
+mysql:
+  enabled: false
diff --git a/install/gcp-terraform/modules/database/variables.tf b/install/gcp-terraform/modules/database/variables.tf
new file mode 100644
index 00000000000000..2dbd1fc3817743
--- /dev/null
+++ b/install/gcp-terraform/modules/database/variables.tf
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+variable "project" {
+  type = string
+}
+
+variable "region" {
+  type = string
+}
+
+variable "name" {
+  type    = string
+  default = "gitpod-database"
+}
+
+variable "username" {
+  type    = string
+  default = "gitpod"
+}
+
+variable "network" {
+  type = object({
+    id   = string
+    name = string
+  })
+}
+
+variable "gitpod" {
+  type = object({
+    serviceaccount = string
+    namespace      = string
+  })
+  default = {
+    serviceaccount = "gitpod-database"
+    namespace      = "default"
+  }
+}
diff --git a/install/gcp-full-terraform/modules/dns/README.md b/install/gcp-terraform/modules/dns/README.md
similarity index 100%
rename from install/gcp-full-terraform/modules/dns/README.md
rename to install/gcp-terraform/modules/dns/README.md
diff --git a/install/gcp-terraform/modules/dns/locals.tf b/install/gcp-terraform/modules/dns/locals.tf
new file mode 100644
index 00000000000000..97b0fe9467f5ae
--- /dev/null
+++ b/install/gcp-terraform/modules/dns/locals.tf
@@ -0,0 +1,3 @@
+locals {
+  hostname = trimsuffix("${var.subdomain}.${data.google_dns_managed_zone.gitpod.dns_name}", ".")
+}
\ No newline at end of file
diff --git a/install/gcp-terraform/modules/dns/main.tf b/install/gcp-terraform/modules/dns/main.tf
new file mode 100644
index 00000000000000..ecbcbb2bb9314f
--- /dev/null
+++ b/install/gcp-terraform/modules/dns/main.tf
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+
+locals {
+  dns_prefixes = ["", "*.", "*.ws."]
+  google_services = [
+    "dns.googleapis.com",
+    "compute.googleapis.com"
+  ]
+}
+
+# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/dns_managed_zone
+resource "google_project_service" "dns" {
+  count   = length(local.google_services)
+  project = var.project
+  service = local.google_services[count.index]
+
+  disable_dependent_services = false
+  disable_on_destroy         = false
+}
+
+data "google_dns_managed_zone" "gitpod" {
+  name    = var.zone_name
+  project = var.project
+}
+
+resource "google_compute_address" "gitpod" {
+  name    = var.name
+  project = var.project
+  region  = var.region
+}
+
+resource "google_dns_record_set" "gitpod" {
+  count        = length(local.dns_prefixes)
+  name         = "${local.dns_prefixes[count.index]}${var.subdomain}.${data.google_dns_managed_zone.gitpod.dns_name}"
+  type         = "A"
+  ttl          = 300
+  managed_zone = data.google_dns_managed_zone.gitpod.name
+  rrdatas      = [google_compute_address.gitpod.address]
+  project      = var.project
+}
+
+#
+# Google Service Account
+#
+
+resource "google_service_account" "dns" {
+  account_id   = var.name
+  display_name = var.name
+  description  = "Gitpod DNS Admin ${var.name}"
+  project      = var.project
+}
+
+resource "google_project_iam_member" "dns" {
+  project = var.project
+  role    = "roles/dns.admin"
+  member  = "serviceAccount:${google_service_account.dns.email}"
+}
+
+resource "google_service_account_key" "dns" {
+  service_account_id = google_service_account.dns.name
+}
+
+resource "kubernetes_secret" "dns" {
+  provider = kubernetes
+  metadata {
+    name      = "gitpod-dns"
+    namespace = var.gitpod.namespace
+  }
+  data = {
+    "key.json" = base64decode(google_service_account_key.dns.private_key)
+  }
+}
+
+#
+# values.yaml
+#
+
+data "template_file" "values" {
+  template = file("${path.module}/templates/values.tpl")
+  vars = {
+    hostname       = local.hostname
+    loadBalancerIP = google_compute_address.gitpod.address
+  }
+}
diff --git a/install/gcp-terraform/modules/dns/outputs.tf b/install/gcp-terraform/modules/dns/outputs.tf
new file mode 100644
index 00000000000000..009b3c1f7a79c0
--- /dev/null
+++ b/install/gcp-terraform/modules/dns/outputs.tf
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+output "service_account_key" {
+  value = base64decode(google_service_account_key.dns.private_key)
+}
+
+output "values" {
+  value = data.template_file.values.rendered
+}
+
+output "hostname" {
+  value = local.hostname
+}
+
+output "address" {
+  value = google_compute_address.gitpod.address
+}
\ No newline at end of file
diff --git a/install/gcp-terraform/modules/dns/templates/values.tpl b/install/gcp-terraform/modules/dns/templates/values.tpl
new file mode 100644
index 00000000000000..5a5f145b505f28
--- /dev/null
+++ b/install/gcp-terraform/modules/dns/templates/values.tpl
@@ -0,0 +1,13 @@
+# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+
+ingressMode: hosts
+hostname: ${hostname}
+components:
+  proxy:
+    loadBalancerIP: ${loadBalancerIP}
+
+branding:
+  homepage: ${hostname}
+  redirectUrlIfNotAuthenticated: /workspaces/
+  redirectUrlAfterLogout: ${hostname}
diff --git a/install/gcp-full-terraform/modules/registry/variables.tf b/install/gcp-terraform/modules/dns/variables.tf
similarity index 66%
rename from install/gcp-full-terraform/modules/registry/variables.tf
rename to install/gcp-terraform/modules/dns/variables.tf
index 62ff682016b753..929a6df56d53e6 100644
--- a/install/gcp-full-terraform/modules/registry/variables.tf
+++ b/install/gcp-terraform/modules/dns/variables.tf
@@ -7,14 +7,21 @@ variable "project" {
   type = string
 }
 
-variable "location" {
-  type    = string
-  default = "EU"
+variable "region" {
+  type = string
 }
 
-variable "hostname" {
+variable "zone_name" {
+  type = string
+}
+
+variable "name" {
+  type = string
+}
+
+variable "subdomain" {
   type    = string
-  default = "gcr.io"
+  default = "gitpod"
 }
 
 variable "gitpod" {
@@ -24,10 +31,4 @@ variable "gitpod" {
   default = {
     namespace = "default"
   }
-}
-
-variable "requirements" {
-  type = object({
-    kubernetes = string
-  })
-}
+}
\ No newline at end of file
diff --git a/install/gcp-terraform/modules/dns/versions.tf b/install/gcp-terraform/modules/dns/versions.tf
new file mode 100644
index 00000000000000..1fb74b3fff5526
--- /dev/null
+++ b/install/gcp-terraform/modules/dns/versions.tf
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+terraform {
+  required_version = ">= 0.14"
+  required_providers {
+    google = {
+      source = "hashicorp/google"
+    }
+    kubernetes = {
+      source = "hashicorp/kubernetes"
+    }
+  }
+}
diff --git a/install/gcp-terraform/modules/gitpod/main.tf b/install/gcp-terraform/modules/gitpod/main.tf
new file mode 100644
index 00000000000000..c3f03452567316
--- /dev/null
+++ b/install/gcp-terraform/modules/gitpod/main.tf
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+
+
+
+
+#
+# Gitpod
+#
+
+data "template_file" "node_layout_values" {
+  template = file("${path.module}/templates/values.node-layout.tpl")
+}
+
+data "template_file" "values" {
+  template = file("${path.module}/templates/values.tpl")
+  vars = {
+    image_prefix = var.gitpod.image_prefix
+    version      = var.gitpod.version
+    license      = var.license
+  }
+}
+
+resource "helm_release" "gitpod" {
+  name  = "gitpod"
+  chart = "${path.root}/${var.gitpod.chart}"
+
+  namespace         = var.namespace
+  create_namespace  = false
+  cleanup_on_fail   = false
+  wait              = false
+  dependency_update = true
+
+  values = [
+    var.values,
+    data.template_file.node_layout_values.rendered,
+    data.template_file.values.rendered,
+    var.dns_values,
+    var.certificate_values,
+    var.database_values,
+    var.registry_values,
+    var.storage_values,
+  ]
+}
diff --git a/install/gcp-terraform/modules/helm/templates/node-layout.tpl b/install/gcp-terraform/modules/gitpod/templates/values.node-layout.tpl
similarity index 85%
rename from install/gcp-terraform/modules/helm/templates/node-layout.tpl
rename to install/gcp-terraform/modules/gitpod/templates/values.node-layout.tpl
index a56c9b86b7b05f..52ffc12e9a722f 100644
--- a/install/gcp-terraform/modules/helm/templates/node-layout.tpl
+++ b/install/gcp-terraform/modules/gitpod/templates/values.node-layout.tpl
@@ -1,3 +1,6 @@
+# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+
 components:
   nodeDaemon:
     # Gitpod copies Theia to each node. This setting configures where Theia is copied to.
@@ -9,7 +12,7 @@ components:
     # Depending on the types of node you operate that may cause image builds to fail or not perform well. We recommend you give the Docker daemon
     # fast storage on the node, e.g. an SSD.
     hostDindData: /mnt/disks/ssd0/docker
-  wsDaemon:
+  wsSync:
     # Workspace data is stored on the nodes. This setting configures where on the ndoe the workspace data lives.
     # The faster this location is (in terms of IO) the faster workspaces will initialize.
     hostWorkspaceArea: /mnt/disks/ssd0/workspaces
diff --git a/install/gcp-terraform/modules/gitpod/templates/values.tpl b/install/gcp-terraform/modules/gitpod/templates/values.tpl
new file mode 100644
index 00000000000000..55693874d30a67
--- /dev/null
+++ b/install/gcp-terraform/modules/gitpod/templates/values.tpl
@@ -0,0 +1,7 @@
+# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+
+installPodSecurityPolicies: true
+imagePrefix: ${image_prefix}
+version: ${version}
+license: ${license}
diff --git a/install/gcp-terraform/modules/gitpod/variables.tf b/install/gcp-terraform/modules/gitpod/variables.tf
new file mode 100644
index 00000000000000..a087bf44480a77
--- /dev/null
+++ b/install/gcp-terraform/modules/gitpod/variables.tf
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+
+variable "project" {
+  type = string
+}
+
+variable "region" {
+  type = string
+}
+
+variable "database_values" {
+  type    = string
+  default = ""
+}
+
+variable "storage_values" {
+  type    = string
+  default = ""
+}
+
+variable "registry_values" {
+  type    = string
+  default = ""
+}
+
+variable "dns_values" {
+  type    = string
+  default = ""
+}
+
+variable "certificate_values" {
+  type    = string
+  default = ""
+}
+
+variable "namespace" {
+  type = string
+  default = "default"
+}
+
+variable "values" {
+  type    = string
+  default = ""
+}
+
+variable "gitpod" {
+  type = object({
+    chart        = string
+    version      = string
+    image_prefix = string
+  })
+}
+
+variable "license" {
+  type    = string
+  default = ""
+}
diff --git a/install/gcp-terraform/modules/helm/main.tf b/install/gcp-terraform/modules/helm/main.tf
deleted file mode 100644
index e3a90e23da7991..00000000000000
--- a/install/gcp-terraform/modules/helm/main.tf
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-
-data "template_file" "gitpod_values_node_affinity" {
-  template = file("${path.module}/templates/node-affinity.tpl")
-}
-
-data "template_file" "gitpod_values_node_layout" {
-  template = file("${path.module}/templates/node-layout.tpl")
-}
-
-resource "helm_release" "gitpod" {
-  name  = "gitpod-self-hosted"
-  chart = var.path
-
-  namespace        = var.kubernetes.namespace
-  create_namespace = true
-  timeout          = "300"
-  wait             = false
-  values = flatten([
-    data.template_file.gitpod_values_node_layout.rendered,
-    var.values,
-  ])
-
-  set {
-    name  = "hostname"
-    value = trimsuffix(var.hostname, ".")
-  }
-
-  set {
-    name  = "components.proxy.loadBalancerIP"
-    value = var.loadBalancerIP
-  }
-
-  set {
-    name  = "installPodSecurityPolicies"
-    value = "true"
-  }
-
-  set {
-    name  = "ingressMode"
-    value = "pathAndHost"
-  }
-
-  set {
-    name  = "components.wsProxy.disabled"
-    value = false
-  }
-
-  set {
-    name  = "forceHTTPS"
-    value = var.forceHTTPS
-  }
-
-  set {
-    name  = "authProviders"
-    value = "[]"
-  }
-
-  set {
-    name  = "components.proxy.certbot.enabled"
-    value = var.certbotEnabled
-  }
-
-  set {
-    name  = "components.proxy.certbot.email"
-    value = var.certificateEmail
-  }
-
-  depends_on = [
-    var.requirements
-  ]
-}
-
-resource "null_resource" "done" {
-  depends_on = [
-    helm_release.gitpod
-  ]
-}
diff --git a/install/gcp-terraform/modules/helm/templates/node-affinity.tpl b/install/gcp-terraform/modules/helm/templates/node-affinity.tpl
deleted file mode 100644
index b81bbee1cef76b..00000000000000
--- a/install/gcp-terraform/modules/helm/templates/node-affinity.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-affinity:
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: gitpod.io/workload_meta
-          operator: In
-          values:
-          - "true"
-
-components:
-  workspace:
-    template:
-      spec:
-        affinity:
-          nodeAffinity:
-            requiredDuringSchedulingIgnoredDuringExecution:
-              nodeSelectorTerms:
-              - matchExpressions:
-                - key: gitpod.io/workload_workspace
-                  operator: In
-                  values:
-                  - "true"
\ No newline at end of file
diff --git a/install/gcp-terraform/modules/helm/templates/values.tpl b/install/gcp-terraform/modules/helm/templates/values.tpl
deleted file mode 100644
index f4f71f545f2714..00000000000000
--- a/install/gcp-terraform/modules/helm/templates/values.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Terraform Module: gitpod
-#
-
-hostname: ${hostname}
-components:
-  proxy:
-    loadBalancerIP: ${loadBalancerIP}
-
-installPodSecurityPolicies: true
-
-imagePrefix: eu.gcr.io/gitpod-core-dev/build/
-version: cw-core-docker-installer.7
\ No newline at end of file
diff --git a/install/gcp-terraform/modules/helm/variables.tf b/install/gcp-terraform/modules/helm/variables.tf
deleted file mode 100644
index a0cf160a69dc49..00000000000000
--- a/install/gcp-terraform/modules/helm/variables.tf
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-variable "project" {
-  type = string
-}
-
-variable "region" {
-  type = string
-}
-
-variable "kubernetes" {
-  type = object({
-    namespace = string
-  })
-  default = {
-    namespace = "gitpod"
-  }
-}
-
-variable "hostname" {
-  type = string
-}
-
-variable "loadBalancerIP" {
-  type = string
-}
-
-variable "path" {
-  type = string
-}
-
-variable "values" {
-  type = list(string)
-}
-
-variable "requirements" {
-  type = list(string)
-}
-
-variable "gitpod" {
-  type = object({
-    license = string
-  })
-  default = {
-    license = ""
-  }
-}
-
-variable "forceHTTPS" {
-  type    = bool
-  default = false
-}
-
-variable "certbotEnabled" {
-  type    = bool
-  default = false
-}
-
-variable "certificateEmail" {
-  type = string
-}
-
-
diff --git a/install/gcp-terraform/modules/kubeconfig/main.tf b/install/gcp-terraform/modules/kubeconfig/main.tf
new file mode 100644
index 00000000000000..93de450e40d212
--- /dev/null
+++ b/install/gcp-terraform/modules/kubeconfig/main.tf
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+ */
+
+
+data "google_client_config" "provider" {}
+
+# https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/container_cluster
+data "google_container_cluster" "kubernetes" {
+  name     = var.cluster.name
+  project  = data.google_client_config.provider.project
+  location = data.google_client_config.provider.region
+}
+
+# https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file
+data "template_file" "kubeconfig" {
+  template = file("${path.module}/templates/kubeconfig.tpl")
+  vars = {
+    cluster_ca_certificate = data.google_container_cluster.kubernetes.master_auth[0].cluster_ca_certificate
+    host                   = data.google_container_cluster.kubernetes.endpoint
+    name                   = data.google_container_cluster.kubernetes.name
+    token                  = data.google_client_config.provider.access_token
+    namespace              = "default"
+  }
+}
+
+# https://registry.terraform.io/providers/hashicorp/local/latest/docs/resources/file
+resource "local_file" "kubeconfig" {
+  content         = data.template_file.kubeconfig.rendered
+  filename        = "${path.root}/secrets/kubeconfig"
+  file_permission = 0400
+}
diff --git a/install/gcp-full-terraform/modules/dns/locals.tf b/install/gcp-terraform/modules/kubeconfig/outputs.tf
similarity index 74%
rename from install/gcp-full-terraform/modules/dns/locals.tf
rename to install/gcp-terraform/modules/kubeconfig/outputs.tf
index bcaa3d238b6520..f636108b2bd706 100644
--- a/install/gcp-full-terraform/modules/dns/locals.tf
+++ b/install/gcp-terraform/modules/kubeconfig/outputs.tf
@@ -3,6 +3,7 @@
  * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
  */
 
-locals {
-  dns_prefixes = ["", "*.", "*.ws."]
+
+output "path" {
+  value = local_file.kubeconfig.filename
 }
diff --git a/install/gcp-terraform/modules/kubeconfig/templates/kubeconfig.tpl b/install/gcp-terraform/modules/kubeconfig/templates/kubeconfig.tpl
new file mode 100644
index 00000000000000..ef2f5d5b5b4f96
--- /dev/null
+++ b/install/gcp-terraform/modules/kubeconfig/templates/kubeconfig.tpl
@@ -0,0 +1,26 @@
+# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+
+
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: ${cluster_ca_certificate}
+    server: https://${host}
+  name: ${name}-cluster
+contexts:
+- context:
+    cluster: ${name}-cluster
+    namespace: ${namespace}
+    user: ${name}-user
+  name: ${name}
+current-context: ${name}
+kind: Config
+preferences: {}
+users:
+- name: ${name}-user
+  user:
+    auth-provider:
+      name: gcp
+      access-token: ${token}
+    
\ No newline at end of file
diff --git a/install/gcp-full-terraform/modules/mysql_helm/outputs.tf b/install/gcp-terraform/modules/kubeconfig/terraform.tf
similarity index 51%
rename from install/gcp-full-terraform/modules/mysql_helm/outputs.tf
rename to install/gcp-terraform/modules/kubeconfig/terraform.tf
index 05dc7a3494fe54..2202e0e99860ef 100644
--- a/install/gcp-full-terraform/modules/mysql_helm/outputs.tf
+++ b/install/gcp-terraform/modules/kubeconfig/terraform.tf
@@ -4,14 +4,13 @@
  */
 
 
-#
-# Output
-#
-
-output "values" {
-  value = data.template_file.gitpod_values_database.rendered
-}
-
-output "done" {
-  value = null_resource.done.id
+terraform {
+  required_providers {
+    google = {
+      source = "hashicorp/google"
+    }
+    kubernetes = {
+      source = "hashicorp/kubernetes"
+    }
+  }
 }
diff --git a/install/gcp-full-terraform/modules/monitoring/locals.tf b/install/gcp-terraform/modules/kubeconfig/variables.tf
similarity index 66%
rename from install/gcp-full-terraform/modules/monitoring/locals.tf
rename to install/gcp-terraform/modules/kubeconfig/variables.tf
index b09331b04d8c30..e40a7803ab9696 100644
--- a/install/gcp-full-terraform/modules/monitoring/locals.tf
+++ b/install/gcp-terraform/modules/kubeconfig/variables.tf
@@ -3,12 +3,9 @@
  * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
  */
 
-#
-# Locals
-#
 
-locals {
-  google_services = [
-    "stackdriver.googleapis.com",
-  ]
-}
+variable "cluster" {
+  type = object({
+    name = string
+  })
+}
\ No newline at end of file
diff --git a/install/gcp-terraform/modules/kubernetes/README.md b/install/gcp-terraform/modules/kubernetes/README.md
new file mode 100644
index 00000000000000..5d6b110cf6bfaf
--- /dev/null
+++ b/install/gcp-terraform/modules/kubernetes/README.md
@@ -0,0 +1,18 @@
+# Terraform Module: kubernetes
+
+This module installs the kubernetes cluster using the Google Kubernetes Engin (GKE).
+
+
+## Input Variables
+
+- `project`
+- `location`: either the region or zone for the cluster
+- `name`: the name of the kubernetes cluster, default: gitpod-cluster
+- `network`: the name of the network the cluster is created in, the value is taken from the `network` module
+- `subnets`: a list of the subnets created in the `network` module
+
+
+
+## Output Variables
+
+- `cluster`: returns the cluster resource including the connection details used by the helm and kubernets modules
\ No newline at end of file
diff --git a/install/gcp-terraform/modules/kubernetes/locals.tf b/install/gcp-terraform/modules/kubernetes/locals.tf
deleted file mode 100644
index bbcf4f4417ee05..00000000000000
--- a/install/gcp-terraform/modules/kubernetes/locals.tf
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-locals {
-  roles = [
-    "roles/clouddebugger.agent",
-    "roles/cloudtrace.agent",
-    "roles/errorreporting.writer",
-    "roles/logging.viewer",
-    "roles/logging.logWriter",
-    "roles/monitoring.metricWriter",
-    "roles/monitoring.viewer",
-    "roles/storage.admin",
-    "roles/storage.objectAdmin",
-  ]
-}
diff --git a/install/gcp-terraform/modules/kubernetes/main.tf b/install/gcp-terraform/modules/kubernetes/main.tf
index 296337f95ad069..09905402e6ec5a 100644
--- a/install/gcp-terraform/modules/kubernetes/main.tf
+++ b/install/gcp-terraform/modules/kubernetes/main.tf
@@ -4,83 +4,115 @@
  */
 
 
-resource "google_project_service" "container" {
-  project = var.project
-  service = "container.googleapis.com"
-
-  disable_on_destroy = false
+locals {
+  roles = [
+    "roles/clouddebugger.agent",
+    "roles/cloudtrace.agent",
+    "roles/errorreporting.writer",
+    "roles/logging.viewer",
+    "roles/logging.logWriter",
+    "roles/monitoring.metricWriter",
+    "roles/monitoring.viewer",
+    "roles/storage.admin",
+    "roles/storage.objectAdmin",
+  ]
+  google_services = [
+    "iam.googleapis.com",
+    "compute.googleapis.com",
+    "container.googleapis.com",
+    "logging.googleapis.com",
+  ]
 }
 
-data "google_compute_network" "gitpod" {
-  name = var.network
+# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_service
+resource "google_project_service" "kubernetes" {
+  count   = length(local.google_services)
+  project = var.project
+  service = local.google_services[count.index]
 
-  depends_on = [
-    var.requirements
-  ]
+  disable_dependent_services = false
+  disable_on_destroy         = false
 }
 
-resource "random_id" "gitpod_cluster" {
-  byte_length = 2
+resource "google_compute_subnetwork" "gitpod" {
+  name                     = var.subnet.name
+  ip_cidr_range            = var.subnet.cidr
+  region                   = var.region
+  network                  = var.network
+  private_ip_google_access = true
 }
 
-resource "google_service_account" "gitpod_cluster" {
-  account_id   = "gitpod-cluster-${random_id.gitpod_cluster.hex}"
-  display_name = "gitpod-cluster-${random_id.gitpod_cluster.hex}"
-  description  = "Gitpod Meta Nodes ${var.project}"
+resource "google_service_account" "gitpod" {
+  account_id   = "${var.name}-nodes"
+  display_name = "${var.name}-nodes"
+  description  = "Gitpod Nodes ${var.name}"
   project      = var.project
 }
 
-resource "google_project_iam_binding" "gitpod_cluster" {
+resource "google_project_iam_member" "gitpod" {
   count   = length(local.roles)
   project = var.project
   role    = local.roles[count.index]
-  members = [
-    "serviceAccount:${google_service_account.gitpod_cluster.email}",
-  ]
-}
-
-resource "random_password" "kubernetes" {
-  length  = 32
-  special = false
+  member  = "serviceAccount:${google_service_account.gitpod.email}"
 }
 
 resource "google_container_cluster" "gitpod" {
-  depends_on = [
-    google_project_service.container
-  ]
-
-  name     = "${var.name}-${random_id.gitpod_cluster.hex}"
+  name     = var.name
   project  = var.project
-  location = var.location
+  location = var.region
 
   remove_default_node_pool = true
-  initial_node_count       = var.kubernetes.initial_node_count
+  initial_node_count       = 1
 
   master_auth {
-    username = var.username
-    password = random_password.kubernetes.result
-
     client_certificate_config {
       issue_client_certificate = true
     }
   }
 
-  network            = var.network
-  min_master_version = "1.16.15-gke.4300"
+  default_max_pods_per_node = 110
+
+  pod_security_policy_config {
+    enabled = true
+  }
+
+  addons_config {
+    network_policy_config {
+      disabled = false
+    }
+  }
+
+  network_policy {
+    enabled  = true
+    provider = "CALICO"
+  }
+
+  network    = var.network
+  subnetwork = google_compute_subnetwork.gitpod.id
+
+  ip_allocation_policy {}
+
+  min_master_version = "1.16"
 }
 
-resource "google_container_node_pool" "gitpod_cluster" {
-  name       = "${google_container_cluster.gitpod.name}-${random_id.gitpod_cluster.hex}-nodepool"
-  location   = var.location
-  cluster    = google_container_cluster.gitpod.name
-  node_count = 1
+resource "google_container_node_pool" "gitpod" {
+
+  name     = "nodepool-0"
+  location = var.region
+  cluster  = google_container_cluster.gitpod.name
+
+  initial_node_count = 1
 
   node_config {
-    preemptible     = var.kubernetes.node_pool.preemptible
-    machine_type    = var.kubernetes.node_pool.machine_type
-    disk_size_gb    = var.kubernetes.node_pool.disk_size_gb
-    disk_type       = var.kubernetes.node_pool.disk_type
-    local_ssd_count = var.kubernetes.node_pool.local_ssd_count
+    preemptible     = false
+    machine_type    = "n1-standard-8"
+    disk_size_gb    = 100
+    disk_type       = "pd-ssd"
+    local_ssd_count = 1
+
+    workload_metadata_config {
+      node_metadata = "SECURE"
+    }
 
     metadata = {
       disable-legacy-endpoints = "true"
@@ -91,7 +123,7 @@ resource "google_container_node_pool" "gitpod_cluster" {
       "gitpod.io/workload_workspace" = "true"
     }
 
-    image_type = var.kubernetes.node_pool.image_type
+    image_type = "UBUNTU_CONTAINERD"
 
     oauth_scopes = [
       "https://www.googleapis.com/auth/logging.write",
@@ -99,55 +131,12 @@ resource "google_container_node_pool" "gitpod_cluster" {
       "https://www.googleapis.com/auth/devstorage.read_write",
     ]
 
-    service_account = google_service_account.gitpod_cluster.email
+    service_account = google_service_account.gitpod.email
   }
-}
-
-data "template_file" "kubeconfig" {
-  depends_on = [
-    google_container_node_pool.gitpod_cluster
-  ]
-
-  template = file("${path.module}/templates/kubeconfig.tpl")
-  vars = {
-    server                     = google_container_cluster.gitpod.endpoint
-    certificate_authority_data = google_container_cluster.gitpod.master_auth[0].cluster_ca_certificate
-    name                       = google_container_cluster.gitpod.name
-    namespace                  = var.gitpod.namespace
-    # client_certificate         = google_container_cluster.gitpod.master_auth[0].client_certificate
-    # client_key                 = google_container_cluster.gitpod.master_auth[0].client_key
-    username = google_container_cluster.gitpod.master_auth[0].username
-    password = google_container_cluster.gitpod.master_auth[0].password
-  }
-}
-
-resource "local_file" "gitpod_cluster_kubeconfig" {
-  depends_on = [
-    google_container_node_pool.gitpod_cluster
-  ]
 
-  content  = data.template_file.kubeconfig.rendered
-  filename = "${path.root}/secrets/kubeconfig"
-}
-
-resource "null_resource" "kubernetes_credentials" {
-  depends_on = [
-    google_container_cluster.gitpod
-  ]
-
-  provisioner "local-exec" {
-    command = "gcloud container clusters get-credentials $CLUSTER --region $REGION --project $PROJECT"
-
-    environment = {
-      CLUSTER = google_container_cluster.gitpod.name
-      REGION  = var.location
-      PROJECT = var.project
-    }
+  lifecycle {
+    ignore_changes = [
+      initial_node_count,
+    ]
   }
 }
-
-resource "null_resource" "done" {
-  depends_on = [
-    google_container_node_pool.gitpod_cluster
-  ]
-}
diff --git a/install/gcp-terraform/modules/kubernetes/outputs.tf b/install/gcp-terraform/modules/kubernetes/outputs.tf
index 074ca2a6c7ed8a..62092c302c3170 100644
--- a/install/gcp-terraform/modules/kubernetes/outputs.tf
+++ b/install/gcp-terraform/modules/kubernetes/outputs.tf
@@ -3,14 +3,7 @@
  * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
  */
 
+
 output "cluster" {
   value = google_container_cluster.gitpod
-}
-
-output "kubeconfig" {
-  value = data.template_file.kubeconfig.rendered
-}
-
-output "done" {
-  value = null_resource.done.id
 }
\ No newline at end of file
diff --git a/install/gcp-terraform/modules/kubernetes/templates/kubeconfig.tpl b/install/gcp-terraform/modules/kubernetes/templates/kubeconfig.tpl
deleted file mode 100644
index 1ee52b9eb0e676..00000000000000
--- a/install/gcp-terraform/modules/kubernetes/templates/kubeconfig.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: v1
-clusters:
-- cluster:
-    certificate-authority-data: ${certificate_authority_data}
-    server: https://${server}
-  name: ${name}-cluster
-contexts:
-- context:
-    cluster: ${name}-cluster
-    namespace: ${namespace}
-    user: ${name}-user
-  name: ${name}
-current-context: ${name}
-kind: Config
-preferences: {}
-users:
-- name: ${name}-user
-  user:
-    username: ${username}
-    password: ${password}
diff --git a/install/gcp-terraform/modules/kubernetes/variables.tf b/install/gcp-terraform/modules/kubernetes/variables.tf
index 8f034659a34cdf..c2e2cec998ef53 100644
--- a/install/gcp-terraform/modules/kubernetes/variables.tf
+++ b/install/gcp-terraform/modules/kubernetes/variables.tf
@@ -5,67 +5,28 @@
 
 
 variable "project" {
-  type        = string
-  description = "GCP project"
+  type = string
 }
 
-variable "location" {
-  type        = string
-  description = "Region/Zone"
+variable "region" {
+  type = string
 }
 
 variable "name" {
-  type        = string
-  description = "GKE Cluster Name"
-  default     = "gitpod-cluster"
-}
-
-variable "username" {
-  type    = string
-  default = "admin"
+  type = string
 }
 
 variable "network" {
-  type        = string
-  description = "name of the GCP network this cluster runs in"
+  type = string
 }
 
-variable "gitpod" {
+variable "subnet" {
   type = object({
-    namespace = string
+    name = string
+    cidr = string
   })
   default = {
-    namespace = "gitpod"
+    name = "gitpod-subnet"
+    cidr = "10.23.0.0/16"
   }
-}
-
-variable "kubernetes" {
-  type = object({
-    initial_node_count = number
-    node_pool = object({
-      preemptible     = bool
-      machine_type    = string
-      disk_size_gb    = number
-      disk_type       = string
-      local_ssd_count = number
-      image_type      = string
-    })
-  })
-  default = {
-    initial_node_count = 1
-    node_pool = {
-      preemptible     = false
-      machine_type    = "n1-standard-8"
-      disk_size_gb    = 100
-      disk_type       = "pd-standard"
-      local_ssd_count = 1
-      image_type      = "COS_CONTAINERD"
-    }
-  }
-}
-
-variable "requirements" {
-  type = object({
-    network = string
-  })
-}
+}
\ No newline at end of file
diff --git a/install/gcp-terraform/modules/monitoring/main.tf b/install/gcp-terraform/modules/monitoring/main.tf
deleted file mode 100644
index bbca73f50282f0..00000000000000
--- a/install/gcp-terraform/modules/monitoring/main.tf
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Enable Service APIs
-#
-
-# # https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_service
-# resource "google_project_service" "gitpod_monitoring" {
-#   count   = length(local.google_services)
-#   project = var.project
-#   service = local.google_services[count.index]
-
-#   disable_dependent_services = false
-# }
diff --git a/install/gcp-terraform/modules/network/main.tf b/install/gcp-terraform/modules/network/main.tf
deleted file mode 100644
index a3370aca401d05..00000000000000
--- a/install/gcp-terraform/modules/network/main.tf
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-
-resource "google_project_service" "project" {
-  project = var.project
-  service = "compute.googleapis.com"
-
-  disable_on_destroy = false
-}
-
-resource "random_id" "gitpod" {
-  byte_length = 2
-}
-
-resource "google_compute_network" "gitpod" {
-  name                    = "${var.name}-${random_id.gitpod.hex}"
-  description             = "Gitpod Cluster Network"
-  auto_create_subnetworks = true
-
-  depends_on = [
-    google_project_service.project
-  ]
-}
-
-resource "google_compute_address" "gitpod" {
-  name = "gitpod-static-ip"
-
-  project = var.project
-  region  = var.region
-
-  depends_on = [
-    google_project_service.project
-  ]
-}
-
-resource "null_resource" "done" {
-  depends_on = [
-    google_compute_network.gitpod
-  ]
-}
diff --git a/install/gcp-terraform/modules/network/outputs.tf b/install/gcp-terraform/modules/network/outputs.tf
deleted file mode 100644
index 68ab421c0b276a..00000000000000
--- a/install/gcp-terraform/modules/network/outputs.tf
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-
-output "vpc" {
-  value = google_compute_network.gitpod
-}
-
-output "static_ip" {
-  value = google_compute_address.gitpod.address
-}
-
-output "done" {
-  value = null_resource.done.id
-}
diff --git a/install/gcp-terraform/modules/network/variables.tf b/install/gcp-terraform/modules/network/variables.tf
deleted file mode 100644
index 5ca0b8f310d7b1..00000000000000
--- a/install/gcp-terraform/modules/network/variables.tf
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-
-variable "project" {
-  type = string
-}
-
-variable "region" {
-  type = string
-}
-
-variable "name" {
-  type        = string
-  default     = "vpc-gitpod"
-  description = "network name"
-}
diff --git a/install/gcp-full-terraform/modules/monitoring/README.md b/install/gcp-terraform/modules/registry/README.md
similarity index 100%
rename from install/gcp-full-terraform/modules/monitoring/README.md
rename to install/gcp-terraform/modules/registry/README.md
diff --git a/install/gcp-terraform/modules/registry/main.tf b/install/gcp-terraform/modules/registry/main.tf
index 1a29286447b948..46f011524931cd 100644
--- a/install/gcp-terraform/modules/registry/main.tf
+++ b/install/gcp-terraform/modules/registry/main.tf
@@ -4,94 +4,75 @@
  */
 
 
+locals {
+  google_services = [
+    "containerregistry.googleapis.com"
+  ]
+}
+
+# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_service
 resource "google_project_service" "gitpod_registry" {
+  count   = length(local.google_services)
   project = var.project
-  service = "containerregistry.googleapis.com"
+  service = local.google_services[count.index]
 
-  disable_on_destroy = false
+  disable_dependent_services = false
+  disable_on_destroy         = false
 }
 
-resource "random_id" "gitpod_registry" {
-  byte_length = 2
-}
+
+#
+# Service Account
+#
 
 resource "google_service_account" "gitpod_registry" {
-  account_id   = "gitpod-registry-${random_id.gitpod_registry.hex}"
-  display_name = "gitpod-registry-full"
-  description  = "Gitpod Registry Admin"
+  account_id   = "gitpod-registry-${var.name}"
+  display_name = "gitpod-registry-${var.name}"
+  description  = "Gitpod Registry ${var.name}"
   project      = var.project
 }
 
-resource "google_project_iam_custom_role" "gitpod_registry" {
-  role_id     = "gitpod.registry"
-  title       = "Gitpod Registry"
-  description = "Gitpod Registry Role"
-  permissions = [
-    "storage.buckets.create",
-    "storage.buckets.delete",
-    "storage.buckets.get",
-    "storage.buckets.getIamPolicy",
-    "storage.buckets.list",
-    "storage.buckets.setIamPolicy",
-    "storage.buckets.update",
-    "storage.objects.create",
-    "storage.objects.delete",
-    "storage.objects.get",
-    "storage.objects.getIamPolicy",
-    "storage.objects.list",
-    "storage.objects.setIamPolicy",
-    "storage.objects.update",
-  ]
-}
-
-resource "google_project_iam_binding" "gitpod_registry" {
+resource "google_project_iam_member" "gitpod_registry" {
   project = var.project
-  role    = google_project_iam_custom_role.gitpod_registry.id
-  members = [
-    "serviceAccount:${google_service_account.gitpod_registry.email}"
-  ]
+  role    = "roles/storage.admin"
+  member  = "serviceAccount:${google_service_account.gitpod_registry.email}"
 }
 
 resource "google_service_account_key" "gitpod_registry" {
   service_account_id = google_service_account.gitpod_registry.name
 }
 
-data "template_file" "gitpod_registry_auth" {
+
+
+
+#
+# Registry
+#
+
+data "template_file" "registry" {
   template = file("${path.module}/templates/registry-auth.tpl")
   vars = {
-    hostname = var.hostname
-    auth     = base64encode("_json_key: ${base64decode(google_service_account_key.gitpod_registry.private_key)}")
+    auth = base64encode("_json_key: ${base64decode(google_service_account_key.gitpod_registry.private_key)}")
   }
 }
 
-resource "kubernetes_secret" "gitpod_registry_auth" {
+resource "kubernetes_secret" "registry" {
   metadata {
-    name      = "gitpod-registry-${random_id.gitpod_registry.hex}"
+    name      = "gitpod-registry"
     namespace = var.gitpod.namespace
   }
 
   data = {
-    ".dockerconfigjson" = data.template_file.gitpod_registry_auth.rendered
+    ".dockerconfigjson" = data.template_file.registry.rendered
   }
 
   type = "kubernetes.io/dockerconfigjson"
-
-  depends_on = [
-    var.requirements
-  ]
 }
 
-data "template_file" "gitpod_values_registry" {
+data "template_file" "values" {
   template = file("${path.module}/templates/values.tpl")
   vars = {
-    hostname    = var.hostname
-    project     = var.project
-    secret_name = kubernetes_secret.gitpod_registry_auth.metadata[0].name
+    project    = var.project
+    secretName = kubernetes_secret.registry.metadata[0].name
   }
 }
-
-resource "null_resource" "done" {
-  depends_on = [
-    kubernetes_secret.gitpod_registry_auth
-  ]
-}
diff --git a/install/gcp-terraform/modules/registry/outputs.tf b/install/gcp-terraform/modules/registry/outputs.tf
index 3e649e7ab5b5a0..4612fc1403f314 100644
--- a/install/gcp-terraform/modules/registry/outputs.tf
+++ b/install/gcp-terraform/modules/registry/outputs.tf
@@ -3,14 +3,6 @@
  * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
  */
 
-#
-# Gitpod Helm values.yaml
-#
-
 output "values" {
-  value = data.template_file.gitpod_values_registry.rendered
-}
-
-output "done" {
-  value = null_resource.done.id
+  value = data.template_file.values.rendered
 }
diff --git a/install/gcp-terraform/modules/registry/templates/registry-auth.tpl b/install/gcp-terraform/modules/registry/templates/registry-auth.tpl
index 053e8f36fab6ff..433bd666087c34 100644
--- a/install/gcp-terraform/modules/registry/templates/registry-auth.tpl
+++ b/install/gcp-terraform/modules/registry/templates/registry-auth.tpl
@@ -1,6 +1,6 @@
 {
 	"auths": {
-		"${hostname}": {
+		"eu.gcr.io": {
 			"auth": "${auth}"
 		}
 	}
diff --git a/install/gcp-terraform/modules/registry/templates/values.tpl b/install/gcp-terraform/modules/registry/templates/values.tpl
index 98f29add50469d..189b113da42bd8 100644
--- a/install/gcp-terraform/modules/registry/templates/values.tpl
+++ b/install/gcp-terraform/modules/registry/templates/values.tpl
@@ -1,13 +1,17 @@
+# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+
 components:
   imageBuilder:
     registryCerts: []
     registry:
-      name: "${hostname}/${project}"
-      secretName: ${secret_name}
+      name: "eu.gcr.io/${project}"
+      secretName: ${secretName}
+#      path: secrets/registry-auth.json
 
   workspace:
     pullSecret:
-      secretName: ${secret_name}
+      secretName: ${secretName}
 
 docker-registry:
   enabled: false
diff --git a/install/gcp-terraform/modules/registry/variables.tf b/install/gcp-terraform/modules/registry/variables.tf
index fa2a8ce385c983..19e459fc393b6d 100644
--- a/install/gcp-terraform/modules/registry/variables.tf
+++ b/install/gcp-terraform/modules/registry/variables.tf
@@ -3,13 +3,18 @@
  * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
  */
 
+
 variable "project" {
   type = string
 }
 
-variable "hostname" {
+variable "location" {
   type    = string
-  default = "gcr.io"
+  default = "EU"
+}
+
+variable "name" {
+  type = string
 }
 
 variable "gitpod" {
@@ -20,9 +25,3 @@ variable "gitpod" {
     namespace = "default"
   }
 }
-
-variable "requirements" {
-  type = object({
-    kubernetes = string
-  })
-}
diff --git a/install/gcp-full-terraform/modules/storage/README.md b/install/gcp-terraform/modules/storage/README.md
similarity index 100%
rename from install/gcp-full-terraform/modules/storage/README.md
rename to install/gcp-terraform/modules/storage/README.md
diff --git a/install/gcp-terraform/modules/storage/locals.tf b/install/gcp-terraform/modules/storage/locals.tf
deleted file mode 100644
index 515d0ce704442c..00000000000000
--- a/install/gcp-terraform/modules/storage/locals.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-locals {
-  google_services = [
-    "storage-api.googleapis.com",
-    "storage-component.googleapis.com",
-  ]
-}
diff --git a/install/gcp-terraform/modules/storage/main.tf b/install/gcp-terraform/modules/storage/main.tf
index 64b94dd7946cd2..5a792f5eac90bb 100644
--- a/install/gcp-terraform/modules/storage/main.tf
+++ b/install/gcp-terraform/modules/storage/main.tf
@@ -4,97 +4,62 @@
  */
 
 
-resource "google_project_service" "gitpod_storage" {
+locals {
+  google_services = [
+    "storage-api.googleapis.com",
+    "storage-component.googleapis.com",
+  ]
+}
+
+# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_service
+resource "google_project_service" "storage" {
   count   = length(local.google_services)
   project = var.project
   service = local.google_services[count.index]
 
-  disable_on_destroy = false
-}
-
-## IAM
-resource "random_id" "gitpod_storage" {
-  byte_length = 2
+  disable_dependent_services = false
+  disable_on_destroy         = false
 }
 
-resource "google_service_account" "gitpod_storage" {
-  account_id   = "gitpod-workspace-syncer-${random_id.gitpod_storage.hex}"
-  display_name = "gitpod-workspace-syncer"
-  description  = "gitpod-workspace-syncer"
-  project      = var.project
-}
 
-data "google_iam_role" "gitpod_storage_storage_admin_roleinfo" {
-  name = "roles/storage.admin"
-}
 
-data "google_iam_role" "gitpod_storage_object_admin_roleinfo" {
-  name = "roles/storage.objectAdmin"
-}
+#
+# Service Account
+#
 
-resource "google_project_iam_custom_role" "gitpod_storage" {
-  role_id     = "gitpod.storage.${random_id.gitpod_storage.hex}"
-  title       = "Gitpod Storage ${random_id.gitpod_storage.hex}"
-  description = "Gitpod Storage Role ${random_id.gitpod_storage.hex}"
-  permissions = [
-    "storage.buckets.create",
-    "storage.buckets.delete",
-    "storage.buckets.get",
-    "storage.buckets.getIamPolicy",
-    "storage.buckets.list",
-    "storage.buckets.setIamPolicy",
-    "storage.buckets.update",
-    "storage.objects.create",
-    "storage.objects.delete",
-    "storage.objects.get",
-    "storage.objects.getIamPolicy",
-    "storage.objects.list",
-    "storage.objects.setIamPolicy",
-    "storage.objects.update",
-  ]
+resource "google_service_account" "gitpod_storage" {
+  account_id   = "gitpod-storage-${var.name}"
+  display_name = "gitpod-storage-${var.name}"
+  description  = "gitpod-workspace-syncer ${var.name}"
+  project      = var.project
 }
 
-resource "google_project_iam_binding" "gitpod_storage" {
+resource "google_project_iam_member" "gitpod_storage" {
   project = var.project
-  role    = google_project_iam_custom_role.gitpod_storage.id
-  members = [
-    "serviceAccount:${google_service_account.gitpod_storage.email}"
-  ]
+  role    = "roles/storage.admin"
+  member  = "serviceAccount:${google_service_account.gitpod_storage.email}"
 }
 
 resource "google_service_account_key" "gitpod_storage" {
   service_account_id = google_service_account.gitpod_storage.name
 }
 
-## Kubernetes resources
-resource "kubernetes_secret" "gitpod_storage" {
+resource "kubernetes_secret" "storage" {
   metadata {
-    name      = "gitpod-storage-${random_id.gitpod_storage.hex}"
+    name      = "gcloud-creds"
     namespace = var.gitpod.namespace
   }
 
   data = {
     "key.json" = base64decode(google_service_account_key.gitpod_storage.private_key)
   }
-
-  depends_on = [
-    var.requirements,
-  ]
-
 }
 
-## Helm values.yaml
-data "template_file" "gitpod_storage_values" {
+data "template_file" "values" {
   template = file("${path.module}/templates/values.tpl")
   vars = {
-    project     = var.project
-    region      = var.region
-    secret_name = "gitpod-storage-${random_id.gitpod_storage.hex}"
+    secretName = kubernetes_secret.storage.metadata[0].name
+    region     = var.region
+    project    = var.project
   }
 }
-
-resource "null_resource" "done" {
-  depends_on = [
-    kubernetes_secret.gitpod_storage
-  ]
-}
diff --git a/install/gcp-terraform/modules/storage/outputs.tf b/install/gcp-terraform/modules/storage/outputs.tf
index 17f472429ad1fd..4612fc1403f314 100644
--- a/install/gcp-terraform/modules/storage/outputs.tf
+++ b/install/gcp-terraform/modules/storage/outputs.tf
@@ -4,9 +4,5 @@
  */
 
 output "values" {
-  value = data.template_file.gitpod_storage_values.rendered
-}
-
-output "done" {
-  value = null_resource.done.id
+  value = data.template_file.values.rendered
 }
diff --git a/install/gcp-terraform/modules/storage/templates/values.tpl b/install/gcp-terraform/modules/storage/templates/values.tpl
index 82472bbeca5898..abc87e69478e4c 100644
--- a/install/gcp-terraform/modules/storage/templates/values.tpl
+++ b/install/gcp-terraform/modules/storage/templates/values.tpl
@@ -1,17 +1,41 @@
+# Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+
 components:
-  wsManager:
-    volumes:
-    - name: gcloud-creds
-      secret:
-        secretName: ${secret_name}
-    volumeMounts:
-    - mountPath: /credentials
-      name: gcloud-creds
   wsDaemon:
+    name: "ws-daemon"
+    hostWorkspaceArea: /var/gitpod/workspaces
+    servicePort: 8080
+    workspaceSizeLimit: ""
+    containerRuntime:
+      runtime: containerd
+      containerd:
+        socket: /run/containerd/containerd.sock
+      nodeRoots: 
+        - /var/lib
+    userNamespaces:
+      shiftfsModuleLoader:
+        enabled: false
+        imageName: "shiftfs-module-loader"
+    registryProxyPort: 8081
+    remoteStorage:
+      kind: gcloud
+      backupTrail:
+        enabled: true
+        maxLength: 3
+      gcloud:
+        parallelUpload: 6
+        maximumBackupSize: 32212254720 # 30 GiB
+        projectId: ${project}
+        region: ${region}
+        credentialsFile: /credentials/key.json
+        tmpdir: /mnt/sync-tmp
+        parallelUpload: 6
+
     volumes:
     - name: gcloud-creds
       secret:
-        secretName: ${secret_name}
+        secretName: ${secretName}
     - name: gcloud-tmp
       hostPath:
         path: /mnt/disks/ssd0/sync-tmp
@@ -21,21 +45,19 @@ components:
       name: gcloud-creds
     - mountPath: /mnt/sync-tmp
       name: gcloud-tmp
-    remoteStorage:
-      kind: gcloud
-      gcloud:
-        # You need to set your GCP project ID here.
-        # Beware: the name of your project is not the same as its ID. You can find the project ID under the "Home" page of your GCP project.
-        projectId: ${project}
-        # The GCP region you want the workspace content to be stored in. This should ideally be in the same region as your cluster.
-        region: ${region}
-        # You shouldn't have to change the values below if you're using the templates that ship with this chart.
-        credentialsFile: /credentials/key.json
-        tmpdir: /mnt/sync-tmp
-        parallelUpload: 6
+
+  wsManager:
+    volumes:
+    - name: gcloud-creds
+      secret:
+        secretName: ${secretName}
+    volumeMounts:
+    - mountPath: /credentials
+      name: gcloud-creds
+
   server:
     storage:
-      secretName: ${secret_name}
+      secretName: ${secretName}
       keyFilePath: key.json
 minio:
-  enabled: false
\ No newline at end of file
+  enabled: false
diff --git a/install/gcp-terraform/modules/storage/variables.tf b/install/gcp-terraform/modules/storage/variables.tf
index 1fc9246404a187..6ffad31600713e 100644
--- a/install/gcp-terraform/modules/storage/variables.tf
+++ b/install/gcp-terraform/modules/storage/variables.tf
@@ -8,32 +8,29 @@ variable "project" {
   type = string
 }
 
+variable "location" {
+  type    = string
+  default = "EU"
+}
+
 variable "region" {
   type = string
 }
 
-variable "gitpod" {
-  type = object({
-    namespace = string
-  })
-  default = {
-    namespace = "default"
-  }
+variable "name" {
+  type = string
 }
 
-variable "kubernetes" {
+variable "gitpod" {
   type = object({
-    enabled   = bool
     namespace = string
   })
   default = {
-    enabled   = true
     namespace = "default"
   }
 }
 
-variable "requirements" {
-  type = object({
-    kubernetes = string
-  })
+variable "minio_access_key" {
+  type    = string
+  default = "minio"
 }
diff --git a/install/gcp-terraform/provider.tf b/install/gcp-terraform/provider.tf
deleted file mode 100644
index 15308b4954e6e8..00000000000000
--- a/install/gcp-terraform/provider.tf
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the MIT License. See License-MIT.txt in the project root for license information.
- */
-
-#
-# Provider
-#
-
-
-#
-# Google
-#
-
-provider "google" {
-  project = var.project
-  region  = var.region
-}
-
-
-
-#
-# Kubernetes
-#
-
-provider "kubernetes" {
-  load_config_file = "false"
-
-  host                   = module.kubernetes.cluster.endpoint
-  username               = module.kubernetes.cluster.master_auth[0].username
-  password               = module.kubernetes.cluster.master_auth[0].password
-  client_certificate     = base64decode(module.kubernetes.cluster.master_auth[0].client_certificate)
-  client_key             = base64decode(module.kubernetes.cluster.master_auth[0].client_key)
-  cluster_ca_certificate = base64decode(module.kubernetes.cluster.master_auth[0].cluster_ca_certificate)
-}
-
-
-
-#
-# Helm
-#
-
-provider "helm" {
-  kubernetes {
-    load_config_file = "false"
-
-    host                   = module.kubernetes.cluster.endpoint
-    username               = module.kubernetes.cluster.master_auth[0].username
-    password               = module.kubernetes.cluster.master_auth[0].password
-    client_certificate     = base64decode(module.kubernetes.cluster.master_auth[0].client_certificate)
-    client_key             = base64decode(module.kubernetes.cluster.master_auth[0].client_key)
-    cluster_ca_certificate = base64decode(module.kubernetes.cluster.master_auth[0].cluster_ca_certificate)
-  }
-}
diff --git a/install/gcp-terraform/templates/values.tpl b/install/gcp-terraform/templates/values.tpl
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/install/installer/BUILD.yaml b/install/installer/BUILD.yaml
index 29d6661596fef8..21e3cacce7cd49 100644
--- a/install/installer/BUILD.yaml
+++ b/install/installer/BUILD.yaml
@@ -17,7 +17,8 @@ packages:
     deps:
       - :app
       - chart:helm
-      - install/gcp-terraform:lib
+      - install/gcp-terraform/modules:installer
+      - install/gcp-terraform/environment/installer:lib
       - install/aws-terraform:lib
     argdeps:
       - version
diff --git a/install/installer/dev-layout.yaml b/install/installer/dev-layout.yaml
index 2251962d945766..8747b30b48b9ff 100644
--- a/install/installer/dev-layout.yaml
+++ b/install/installer/dev-layout.yaml
@@ -1,4 +1,4 @@
 helm: "../../chart"
 terraform:
-  gcp: "../gcp-terraform"
+  gcp: "../gcp-terraform/environment/installer"
   aws: "../aws-terraform"
\ No newline at end of file
diff --git a/install/installer/leeway.Dockerfile b/install/installer/leeway.Dockerfile
index d8a08985a8499f..de4f586d94c9a2 100644
--- a/install/installer/leeway.Dockerfile
+++ b/install/installer/leeway.Dockerfile
@@ -16,7 +16,8 @@ RUN wget https://github.com/mikefarah/yq/releases/download/3.3.2/yq_linux_amd64
     echo ${VERSION} > version && \
     rm yq
 
-COPY install-gcp-terraform--lib terraform/gcp
+COPY install-gcp-terraform-environment-installer--lib terraform/gcp
+COPY install-gcp-terraform-modules--installer terraform/gcp/modules
 COPY install-aws-terraform--lib terraform/aws
 RUN echo "chart_location = \"../helm/gitpod\"" >> installer.auto.tfvars && \
     echo "image_prefix   = \"$IMAGE_PREFIX/\""  >> installer.auto.tfvars && \