diff --git a/modules/kubernetes/dbaas/main.tf b/modules/kubernetes/dbaas/main.tf
index 92cbe8b6..63a4a4b6 100644
--- a/modules/kubernetes/dbaas/main.tf
+++ b/modules/kubernetes/dbaas/main.tf
@@ -2,7 +2,7 @@
 variable "tls_secret_name" {}
 variable "dbaas_root_password" {}
 variable "cluster_master_service" {
-  default = "mysql-cluster"
+  default = "mysql"
 }
 variable "prod" {
   default = false
@@ -21,6 +21,94 @@ module "tls_secret" {
   tls_secret_name = var.tls_secret_name
 }
 
+
+resource "kubernetes_service" "mysql" {
+  metadata {
+    name      = var.cluster_master_service
+    namespace = "dbaas"
+  }
+  spec {
+    selector = {
+      app = "mysql"
+    }
+    port {
+      port = 3306
+    }
+  }
+}
+
+resource "kubernetes_deployment" "mysql" {
+  metadata {
+    name      = "mysql"
+    namespace = "dbaas"
+  }
+  spec {
+    selector {
+      match_labels = {
+        app = "mysql"
+      }
+    }
+    strategy {
+      type = "Recreate"
+    }
+    template {
+      metadata {
+        labels = {
+          app = "mysql"
+        }
+      }
+      spec {
+        container {
+          image = "mysql"
+          name  = "mysql"
+          env {
+            name  = "MYSQL_ROOT_PASSWORD"
+            value = var.dbaas_root_password
+          }
+          port {
+            container_port = 3306
+            name           = "mysql"
+          }
+          volume_mount {
+            name       = "mysql-persistent-storage"
+            mount_path = "/var/lib/mysql"
+          }
+        }
+        volume {
+          name = "mysql-persistent-storage"
+          iscsi {
+            target_portal = "iscsi.viktorbarzin.lan:3260"
+            iqn           = "iqn.2020-12.lan.viktorbarzin:storage:dbaas:mysql"
+            lun           = 0
+            fs_type       = "ext4"
+          }
+        }
+      }
+    }
+  }
+}
+
+# resource "kubernetes_persistent_volume" "mysql" {
+#   metadata {
+#     name = "mysql-pv"
+#   }
+#   spec {
+#     capacity = {
+#       "storage" = "10Gi"
+#     }
+#     access_modes = ["ReadWriteOnce"]
+#     persistent_volume_source {
+#       iscsi {
+#         target_portal = "iscsi.viktorbarzin.lan:3260"
+#         iqn           = "iqn.2020-12.lan.viktorbarzin:storage:dbaas:mysql"
+#         lun           = 0
+#         fs_type       = "ext4"
+#       }
+#     }
+#   }
+# }
+
+
 # resource "helm_release" "mysql" {
 #   namespace        = "dbaas"
 #   create_namespace = false
@@ -79,26 +167,6 @@ module "tls_secret" {
 #   }
 # }
 
-resource "kubernetes_persistent_volume" "mysql" {
-  metadata {
-    name = "mysql-pv"
-  }
-  spec {
-    capacity = {
-      "storage" = "10Gi"
-    }
-    access_modes = ["ReadWriteOnce"]
-    persistent_volume_source {
-      iscsi {
-        target_portal = "iscsi.viktorbarzin.lan:3260"
-        iqn           = "iqn.2020-12.lan.viktorbarzin:storage:dbaas:mysql"
-        lun           = 0
-        fs_type       = "ext4"
-      }
-    }
-  }
-}
-
 resource "kubernetes_secret" "cluster-password" {
   metadata {
     name      = "cluster-secret"
diff --git a/modules/kubernetes/url-shortener/main.tf b/modules/kubernetes/url-shortener/main.tf
index d58abcfd..f5334ae3 100644
--- a/modules/kubernetes/url-shortener/main.tf
+++ b/modules/kubernetes/url-shortener/main.tf
@@ -112,7 +112,7 @@ resource "kubernetes_deployment" "shlink" {
           }
           env {
             name  = "DB_HOST"
-            value = "mysql-cluster.dbaas.svc.cluster.local"
+            value = "mysql.dbaas.svc.cluster.local"
           }
           # env {
           #   name  = "DB_USER"
diff --git a/terraform.tfstate b/terraform.tfstate
index 17cd7320..aae3f52a 100644
Binary files a/terraform.tfstate and b/terraform.tfstate differ