diff --git a/terraform/k8s01/.terraform.lock.hcl b/terraform/k8s01/.terraform.lock.hcl
index a400b7eb0eeb8baf9cc07880a179dd4431124c10..dccdef842871829b210411453bb73a7d76282b98 100644
--- a/terraform/k8s01/.terraform.lock.hcl
+++ b/terraform/k8s01/.terraform.lock.hcl
@@ -2,43 +2,24 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/cloudflare/cloudflare" {
-  version     = "3.29.0"
-  constraints = "3.29.0"
+  version     = "3.31.0"
+  constraints = "3.31.0"
   hashes = [
-    "h1:iGDvVJ6kdlopyhR3ONeoh8gZWZg8+M/seP7VM7gOp1I=",
-    "zh:0947f7f9e0234aaeb6b5f344de4148a6379d05370937e1c255872697803c17cc",
-    "zh:17abb230abd852e0e4ed9921cd9aaf03336ad4a13a25b1040ed86cdbddf05123",
-    "zh:2ddf550dbdf5c58bbb8d14de6b2dc76627bb92787b99328300fb312c51e12d1f",
-    "zh:4645758bdefe52c1aa260368522aff6fcb4e508c918e9b2c263c9debd7d71684",
-    "zh:6047320a05d07045f7fb4b24c2540600473a94fc15a24ef99339a6690ab47dfe",
-    "zh:6db2d4e4bc3ab8b6107aec80a8041388c2a7722472c5efa6caf8435a453b1f33",
-    "zh:8b6b75a75567ae44a788128aebcbb59cebd9a9dbc4ddc1b05f4455734363d55a",
-    "zh:90c51deb4e96690ed73d8b8498d5ab2d7bb78597861bbef23fab18764371deb0",
-    "zh:9b0f89952afb5d00e31fb745f1ebb4ef677591ca62c002c744d23bcaa0d51e9a",
-    "zh:9cfe38d8ef5515d164f59b5f4ddc14bb8817051ea4efed54cb7834c66492dd79",
-    "zh:acf89e44b8643d52186ef5155c8889845681471abb60a933017cda9bc38d86ef",
-    "zh:c09205c6f1e39994c2f707cce0758a2cd16949b33566a724644593d2a616ea41",
-    "zh:c5412f2868592db091b91361b7a85fa3a1a97282e9e6e1c5883dd5f6b5f2e86c",
-    "zh:ff93702ca9a99863914718ae4214acffa1a72d481c8e1d3254ccf5930a2d7e10",
-  ]
-}
-
-provider "registry.terraform.io/hashicorp/http" {
-  version = "3.2.1"
-  hashes = [
-    "h1:DfxMa1zM/0NCFWN5PAxivSHJMNkOAFZvDYQkO72ZQmw=",
-    "zh:088b3b3128034485e11dff8da16e857d316fbefeaaf5bef24cceda34c6980641",
-    "zh:09ed1f2462ea4590b112e048c4af556f0b6eafc7cf2c75bb2ac21cd87ca59377",
-    "zh:39c6b0b4d3f0f65e783c467d3f634e2394820b8aef907fcc24493f21dcf73ca3",
-    "zh:47aab45327daecd33158a36c1a36004180a518bf1620cdd5cfc5e1fe77d5a86f",
-    "zh:4d70a990aa48116ab6f194eef393082c21cf58bece933b63575c63c1d2b66818",
-    "zh:65470c43fda950c7e9ac89417303c470146de984201fff6ef84299ea29e02d30",
-    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:842b4dd63e438f5cd5fdfba1c09b8fdf268e8766e6690988ee24e8b25bfd9e8d",
-    "zh:a167a057f7e2d80c78d4b4057538588131fceb983d5c93b07675ad9eb1aa5790",
-    "zh:d0ba69b62b6db788cfe3cf8f7dc6e9a0eabe2927dc119d7fe3fe6573ee559e66",
-    "zh:e28d24c1d5ff24b1d1cc6f0074a1f41a6974f473f4ff7a37e55c7b6dca68308a",
-    "zh:fde8a50554960e5366fd0e1ca330a7c1d24ae6bbb2888137a5c83d83ce14fd18",
+    "h1:y8tULjyRExDVGvD2XtdU7fm0xgKmegieNvMjT60DKTY=",
+    "zh:0186c9dfbf5dc065b96d78ffafcdbcfcaa51021e56c98c7d2dcc792e5dc0c8da",
+    "zh:06d7c74cd2017eb3e26ab3afeb1365f2f91e48971f22de7d6581584fd0d19935",
+    "zh:08db742ab1664a323f7f0b122ca4f7e296fe29699ed97ba530c39d928cba114e",
+    "zh:10e391383eb8d2caf2e2d346ec1d942128dbb5b7973f9ae814cd30a417615a6d",
+    "zh:11b0ac044674304c57bf2dea83134361636757791adea352b60092c1e53c6790",
+    "zh:1e5f366be209a49345c97ebbbcf7ef9bf4cc8d1e881b961fb27fa1ebf470b54b",
+    "zh:20eff55c16d63b2805a807372f636417dccec2fce3aaf62705ffb9b07dec099b",
+    "zh:41deb6d7f8789e9300c67b5361baed8e3fd1e1ca8a34b537dd24af61461c6c25",
+    "zh:9307bd4c6a410d36d53f2d303aed4b28bc0710aef3647f6e7e470924f04e4647",
+    "zh:a668aab4ed0134a967ee6857c51696bb09cd2abcf9fe60f1dab545f50562d701",
+    "zh:cf2b817a9a4d5b275bcce9dbeedcb8926e41c33798516a92127251d5c90f3ec7",
+    "zh:d1e182fb35be4cb757f930dd8e53c1765f71723aca4658afc1696499393bcbf7",
+    "zh:d409f8f82980f468d0a84399d7ec97fc41e3bbeedd5970dae22333709fd5c4ed",
+    "zh:d69587eb50d6dd8c124c0ab23d0ad5c1d7ea4d2ddb9f96079ef10ab69679b36a",
   ]
 }
 
@@ -100,23 +81,23 @@ provider "registry.terraform.io/hashicorp/template" {
 }
 
 provider "registry.terraform.io/hetznercloud/hcloud" {
-  version     = "1.36.1"
-  constraints = "1.36.1"
+  version     = "1.36.2"
+  constraints = "1.36.2"
   hashes = [
-    "h1:xZSvxx6aUo0oZp2uqNxi/+wqnCNEBBuu8y7GeXIO9qA=",
-    "zh:16558b25c7f92f187278e94e951b0ab687882b06acff5b1387f3293f27939f8c",
-    "zh:28fc79ac2189ff0f5e6c9535ada8f57552b6e21c978b59dc78e086c27b9e4b23",
-    "zh:373907f9f7f2cefa94e2d5638bf5bef3d3b17e7655dc84dd6089346c6f4f9096",
-    "zh:394716cd877de682a0772d660f1bdb3838c5d751eca2211105d5ede248c48c39",
-    "zh:3c438c6590fcc8ac65a10039b2f5ba9ee379a734cb93a59c6cf74f385d891e87",
-    "zh:3f777a460a62fd23b283c269f1533b3887bf0c5564581e1e96cf294e077f5a8a",
-    "zh:4f62967553d7ce81ec14db7685306b625970ba6640b5764dc0137675ab97af0b",
-    "zh:56da08f8d75f596d6f9da4f0fd16bd60d1733cabcc260e885e1d7a711d6d3d8b",
-    "zh:62776c885bfa8e715dba6662f1744b5251f4cdd523dd4d1e4ccb2e25489593e9",
-    "zh:64cbb68139aa65f95ab3e654d872f9d34ef991fbf667fc30e0f29b96b5e8b4ed",
-    "zh:75a4b7a73ff0a537214d12d820438b7ae7a33d660e5d793f4ae0ebe3152bff00",
-    "zh:7b59d72538772ada7d51eaa50c905285200b1889ab29948b533412ccdf4d18de",
-    "zh:b84eeaa82bf765c6dd945ae83f1a9271fa5fad53b861b18b09cb8deda67dae13",
-    "zh:e81c3ea971e32a6ca3fdb0cd9e644614308ab2cf2a19482dd8a109d67fe3fb6f",
+    "h1:VO/dl+g5NfJd436hmT+9NOMQk6oRU4Z9TSJJJrNlN0M=",
+    "zh:0498ef4209924b30ce7b4a232dd6aee08feab2ebbc90064db699adc10c16707e",
+    "zh:292e3c0c55d320cf164cdd431ee31580dd86f435aec99721597204bab5de3970",
+    "zh:3ce8558658baa7c4b9f1eeb92427665b4b930e5b157fbf352977778c90e11aaa",
+    "zh:46abd0bdeeba46b86832ed31338ad837b584f7b2152f8a9bfa6c3802f481a6da",
+    "zh:5804e71d411577f06abc0986c8c2e475c49042a192efce5936e4d5bdd874fc22",
+    "zh:7cef0782e8198346bfe7b61601e1cf8f2158280a5cf665140b72838545ca3127",
+    "zh:be81782af391ff4cc0859d976637aa00e6fe34061fe4f1df1f5ab5d62ef94f82",
+    "zh:bf2660e70edf758305085698fc9d05306b174b99559cd0f3f61c0b705ba22275",
+    "zh:caf727b0a378dc8c9c3594bbf176865f87aa732077820ff045eb352f5a48aeed",
+    "zh:cf95fc3121b358c7b7b667193ab36b8cb6140e2f6dfbf6f1b4c55b7fec1bb6ef",
+    "zh:d6d3119f8b971e982b6421dfa3b86314ccaeceaf047a3b6505f79e1a30f8301e",
+    "zh:e6f7f65dced2e88e3082c57ddcd118412595678cf3c7289bc7e12c724b3bd892",
+    "zh:f41f59ca511ab1a591d5abdc7f6d32d2e03a1d6087d206a741f95b7b0dd2ea17",
+    "zh:fbe59fbb5f272a6b206a380f6dbf49837b199960dd038afca2e89b11f72fdfda",
   ]
 }
diff --git a/terraform/k8s01/main.tf b/terraform/k8s01/main.tf
index 11c35d3c492f5c2a66515bb5ad291c081d49e79e..a09b12d811a2a0ce57aeb8b2de3a08a184f3bb65 100644
--- a/terraform/k8s01/main.tf
+++ b/terraform/k8s01/main.tf
@@ -6,7 +6,7 @@ module "gw" {
   dns_domain     = var.dns_domain
   dns_zone_id    = var.dns_zone_id
   dns_record_aaaa = false
-  image          = "fedora-36"
+  image          = "fedora-37"
   user_data      = templatefile("templates/cloud-init.tpl", {netbird_key = "${var.netbird_key}"})
   ssh_keys       = data.hcloud_ssh_keys.all_keys.ssh_keys.*.name
   server_type    = "cx11"
diff --git a/terraform/k8s01/templates/cloud-init.tpl b/terraform/k8s01/templates/cloud-init.tpl
index 387868af418ba1e73e328dd0d99a1d72ddb29dab..882d13442a1360ae090e313fbbad2244f11ff6ae 100644
--- a/terraform/k8s01/templates/cloud-init.tpl
+++ b/terraform/k8s01/templates/cloud-init.tpl
@@ -33,7 +33,7 @@ listen smtp
     timeout connect  7s
     timeout client   1m
     timeout server   1m
-    server srv1-smtp mail.k8s01.si-infra.de:10025 send-proxy-v2
+    server srv1-smtp smtp.k8s01.si-infra.de:10025 send-proxy-v2
 listen l1
     bind 0.0.0.0:80
     bind :::80
@@ -57,7 +57,7 @@ listen submissions
     timeout connect  4s
     timeout client   180s
     timeout server   180s
-    server srv1-submissions mail.k8s01.si-infra.de:465
+    server srv1-submissions smtp.k8s01.si-infra.de:465
 listen imaps
     bind 0.0.0.0:993
     bind :::993
@@ -65,7 +65,7 @@ listen imaps
     timeout connect  4s
     timeout client   180s
     timeout server   180s
-    server srv1-imaps mail.k8s01.si-infra.de:993 check inter 5s
+    server srv1-imaps imap.k8s01.si-infra.de:993 check inter 5s
 
 EOF