diff --git a/main.tf b/main.tf
index 7733a7a8..0d340c45 100644
--- a/main.tf
+++ b/main.tf
@@ -32,6 +32,7 @@ variable "drone_rpc_secret" {}
 # variable "dockerhub_password" {}
 variable "oauth_client_id" {}
 variable "oauth_client_secret" {}
+variable "url_shortener_geolite_license_key" {}
 variable "webhook_handler_fb_verify_token" {}
 variable "webhook_handler_fb_page_token" {}
 variable "webhook_handler_fb_app_secret" {}
@@ -67,6 +68,12 @@ provider "helm" {
     config_path = var.prod ? "" : "~/.kube/config"
   }
 }
+# provider "kubectl" {
+# host                   = "kubernetes.viktorbarzin.lan"
+# cluster_ca_certificate = base64decode(var.eks_cluster_ca)
+# token                  = data.aws_eks_cluster_auth.main.token
+# load_config_file = true
+# }
 
 # Main module to init infra from
 module "pxe_server" {
@@ -219,4 +226,6 @@ module "kubernetes_cluster" {
 
   idrac_username = var.monitoring_idrac_username
   idrac_password = var.monitoring_idrac_password
+
+  url_shortener_geolite_license_key = var.url_shortener_geolite_license_key
 }
diff --git a/modules/kubernetes/dbaas/mysql_chart_values.yaml b/modules/kubernetes/dbaas/mysql_chart_values.yaml
new file mode 100644
index 00000000..16b4161d
--- /dev/null
+++ b/modules/kubernetes/dbaas/mysql_chart_values.yaml
@@ -0,0 +1,10 @@
+---
+orchestrator:
+  persistence:
+    enabled: false
+  ingress:
+    enabled: true
+    tls:
+     - secretName: ${secretName}
+       hosts:
+         - db.viktorbarzin.me
diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf
index a51d8bdf..67106510 100644
--- a/modules/kubernetes/main.tf
+++ b/modules/kubernetes/main.tf
@@ -19,6 +19,7 @@ variable "drone_rpc_secret" {}
 # variable "dockerhub_password" {}
 variable "oauth_client_id" {}
 variable "oauth_client_secret" {}
+variable "url_shortener_geolite_license_key" {}
 variable "webhook_handler_fb_verify_token" {}
 variable "webhook_handler_fb_page_token" {}
 variable "webhook_handler_fb_app_secret" {}
@@ -48,6 +49,11 @@ module "bind" {
   named_conf_options  = var.bind_named_conf_options
 }
 
+module "dbaas" {
+  source          = "./dbaas"
+  tls_secret_name = var.tls_secret_name
+}
+
 module "dnscrypt" {
   source = "./dnscrypt"
 }
@@ -172,6 +178,12 @@ module "reloader" {
   source = "./reloader"
 }
 
+module "url" {
+  source              = "./url-shortener"
+  tls_secret_name     = var.tls_secret_name
+  geolite_license_key = var.url_shortener_geolite_license_key
+}
+
 module "webhook_handler" {
   source          = "./webhook_handler"
   tls_secret_name = var.tls_secret_name
diff --git a/modules/kubernetes/monitoring/grafana_chart_values.yaml b/modules/kubernetes/monitoring/grafana_chart_values.yaml
index fc16dff3..4ee908dd 100644
--- a/modules/kubernetes/monitoring/grafana_chart_values.yaml
+++ b/modules/kubernetes/monitoring/grafana_chart_values.yaml
@@ -37,6 +37,8 @@ grafana.ini:
   auth.anonymous:
     enabled: true
     org_role: Viewer
+  # auth.google:
+  #   enabled: true
   analytics:
     check_for_updates: "true"
   grafana_net:
diff --git a/versions.tf b/versions.tf
index 5d7c4592..08edb954 100644
--- a/versions.tf
+++ b/versions.tf
@@ -3,6 +3,10 @@ terraform {
     kubernetes = {
       source = "hashicorp/kubernetes"
     }
+    # kubectl = {
+    #   source  = "gavinbunney/kubectl"
+    #   version = ">= 1.7.0"
+    # }
   }
   required_version = ">= 0.13"
 }