diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
index 38c805d5..752decb7 100644
--- a/terraform/.terraform.lock.hcl
+++ b/terraform/.terraform.lock.hcl
@@ -26,48 +26,48 @@ provider "registry.opentofu.org/confluentinc/confluent" {
 }
 
 provider "registry.opentofu.org/grafana/grafana" {
-  version     = "3.7.0"
+  version     = "3.9.0"
   constraints = "~> 3.7"
   hashes = [
-    "h1:TLVKTQFJQBHww6ZxwOY8R6FBEICY7fCf1D9cGOoC5qI=",
-    "zh:26d725b30360de5365d356c42cea31d5202caf782db8bd346d0ecf77d18ac9c5",
-    "zh:2d431a39f057f183ba5fa423ff78486eb2cac6c18fdf5b2c4d4209fbd8960121",
-    "zh:43e8e58733ac9dcaa91377c50e6cdcd1bb39e76e9a9aafb8cae4aebf038ec308",
-    "zh:5ecaf4aa7f013aac7fa5e3ab016b9abb9a8b7cffcdc6c82019c109fa8333b2ee",
-    "zh:6543e61c1a8315553e5e7c1cdfe5ba2f596d37590c4d3aa0d0456db32babc1a0",
-    "zh:6b071ce356844e94c97d85c9af67eda914fabf56c9b8483cfb53c0dd39bbb088",
-    "zh:6d9996f23da3f569f0d5321dc328afa64edf19450e00171ae4a231d31af03b54",
-    "zh:6fede397e9e7ef9485eedfd95f5b5793f6c4a455b56b0439ca50e723779e11d0",
-    "zh:742d5c1b4e40bec167c13f9631999ef53f6b344ca264a1acd24bdc93a36dcde2",
-    "zh:749e11cdc0dece4ec46687673c0a763f0013e124e7b0296072841514740e7097",
-    "zh:826e2b2c48b8b732739bc8a4d4cf685855ee1aa803799de798b48a5e64ca8536",
-    "zh:93aa4836d8fd7bb6ca5fcd95edbe6654e0e691bb39b3d903644d7e94fba5cd2f",
-    "zh:99a54e4eda338aa39710bb25591d8fd209afa16b471d4d2995631b415aa8cedd",
-    "zh:9aadfd03a8a13c337f8ff6a9e11b0ddc1c33683a799d89558fd640cdb200ea6e",
-    "zh:9e28385102bccaf9dee2396462cba9ed3777ad8cba486c74c4591aa93eee4ace",
-    "zh:b7593e2e2ecf87c7dccb59c77cd5daf31865ef8dfe043cb23a56327dc65c1f2b",
-    "zh:c4623e2007ea1fc370ee9f2a94f3c70392a8b4a5e037984b6693d2ef1f38504e",
-    "zh:c788b29c98b39fa4d9dc76fc55d351774a261e98fe78dcc2bcf7d6fb36681cf1",
-    "zh:cd5800d77269aa6570a014a0dfecdb16aba4d626dc6d81b41d60c5ed6c0c3120",
-    "zh:d5e891bbfa980ce265100a2d48178804fe7e0823bc2c13f32f0a34a3a82facdc",
+    "h1:XQDGBQCLGpCtlb1iKwyK8CYfruPOpu1FRJxnF22cyzk=",
+    "zh:01a7e1196df58472b60d37245e9ae09bacb0d0424be811d64c1c455d1af0791f",
+    "zh:233cf31e4922e1338cba560cb47a3e6a0bebf05b1f0fbceffebc952fdaf5e87b",
+    "zh:296728c075319cdb1f91bfa6d0789954ef51f704d9b7a65f19e66d60d8fee2ca",
+    "zh:36fbec5a111369946242938a51372ae65d54f32dddc6052a78138bfb20ab869b",
+    "zh:3a7d913405780f0a516f846d7e75c3c183f1f8561cbafd82b399c7526d38a1b1",
+    "zh:4da21bc52fbc5a970ea218db172aa915768927be74d773485735a52cac7cc7c5",
+    "zh:4e3df8069615c846172c5300bf6d325f9192cad56327d85b05655fbc78e1a2d7",
+    "zh:581ef26f5a0ccec93c832e1cf492ff3517e9686ddc2cb6c71fe39c9472854eb9",
+    "zh:7e7be886679f1d582849bf412a0814a54240eaabbb7ef99f2a84f2aad532a368",
+    "zh:89e58025221cb0368cd119ad4f7bee0a087f144985c052347a775c32cdc671ef",
+    "zh:8ad19d5f200a8cb71cda6805ee74152123f34b3d6ba90d08627a2643283bbcac",
+    "zh:8e6589738110ff0221ab0e409296f196eb1754184ac2b189e2d4bf8eb52f60c5",
+    "zh:9de3d49d8178fa710e8038ca2c98eb76168fe9490fa341614282c3b1455000e0",
+    "zh:af793ab4c09cffa4b6311a3998f1f8b2fe3749dd983cacefcb2d797305897743",
+    "zh:cefb46a9ccdcd0ec840295f79f68f2f778ece2a0358054921baa9011b228e9ff",
+    "zh:cf2a5be66cd1609b4d3b28c58a7ca27f86804f337d88fdc6fd932bf14644bfcd",
+    "zh:d3b1a7a015b71949a8421dd64f0125551c03f017101099dd2b876eebb1a9a3ce",
+    "zh:dad6117932c9a7271a8a297d6903ba88f43a727dff71f8deff56823a513f45af",
+    "zh:f13436ffdd58e577772de8a08dc7ec318886cdbe029357b703543f617eb2face",
+    "zh:fbf3278597f461741654cab9792a114fd8f97b20e1376465fc3c91e347b5e13b",
   ]
 }
 
 provider "registry.opentofu.org/hashicorp/aws" {
-  version     = "5.67.0"
+  version     = "5.70.0"
   constraints = "~> 5.13"
   hashes = [
-    "h1:6COU3BqSt/ysJO34vUx/UeCGnfJjnw8oaiX2v+b3cPE=",
-    "zh:009a21cda9ed0fca0605007e65fa417689d61e78c163482a945aa7966e75ab42",
-    "zh:086708088bbbe395edb6a11033cf7aec0b1e67efe9e879d21b6d63cbf08fcf7c",
-    "zh:3244b81ec778f00d31eff37393de2e5b986c6ee9c2f50267aae396e1104b3ff3",
-    "zh:3e4b1fcafc93e54a27cd0e8e49460c373a95982c42006ac06a7b38f0886a13d3",
-    "zh:4c53aa1c44c29ba84a9aab587fba67777818e48f7d2171ae62c220a76e5b1504",
-    "zh:5b623e4d9c4ae0ff2c535a40ce02f52b6f962239a69aea58df88753cc6ad77cc",
-    "zh:66f1532a8e9008454cbf313b5fd352859672f7d1baae4497445ed41038153bfa",
-    "zh:9e459e11ab435a48ca14d47132ed5875e0447c4f005da2992e487e57893257a4",
-    "zh:9fb97365442c60503690bae75101cbf8de64ae43a6714fd243d7d3c7f378e539",
-    "zh:afe4e1f57eac19a0a0cdc2f10d382fc9076f7ff5b7476bfaf3776a74a1a6cf3e",
+    "h1:CyXssPG2Ygw18zEy4t1D7Yupdp0SoHSRopiWLyH6Ekc=",
+    "zh:13e157acaa5717e9c1fef052abc84cdf9d5ba96ca0a4b79150b09b2770f3c1e8",
+    "zh:157ec2424b34ba3a2208ce39763528131d5600daffd72e8f47b08cbd7feebbd4",
+    "zh:2ab7fc0ad9b5acebd43214f2decd2c1ce3ffb620f48e57ff32dd424bdbd27c75",
+    "zh:470934c4f5b4c311b06c365bc6894748b1ea4b3e1e38ffe7a8038a29c3264b03",
+    "zh:47eba28f2c35d71d73dd2d0c2a09c89bdcc99136a5484904b59cc9c299f1a5aa",
+    "zh:59894534729ed071176f794d25d1cb7aecdcffd6825fbb6100e815ba6e12ec10",
+    "zh:72f9efbb883adaaef777c49d4768e08a922e9c75130665fa029f9eb1f350f839",
+    "zh:89464abba42f916af58cd204915db81a9f329d5df584813eac7bf3cf610bfcac",
+    "zh:c101a307d4cc21d2def1040aef5c07e1b3677eafc182cf3ba23ec506b1137b5e",
+    "zh:cad9a818e27739e0dcfb78c9170ce5e1b4619d48be7ec529618198633ec5bb63",
   ]
 }
 
diff --git a/terraform/Makefile b/terraform/Makefile
index cd30aeda..b76545a0 100644
--- a/terraform/Makefile
+++ b/terraform/Makefile
@@ -30,38 +30,38 @@ help:
 
 # Terraform Lifecycle
 
-.PHONY: tfswitch
-tfswitch: ## Run 'tfswitch' utility if the binary exists and versions.tf is present
-	test -f versions.tf && hash tfswitch 2>/dev/null && tfswitch || echo tfswitch not installed
+#.PHONY: tfswitch
+#tfswitch: ## Run 'tfswitch' utility if the binary exists and versions.tf is present
+#	test -f versions.tf && hash tfswitch 2>/dev/null && tfswitch || echo tfswitch not installed
 
 .PHONY: init
-init: tfswitch ## Run 'terraform init' to prepare your working directory for other commands
+init: ## Run 'terraform init' to prepare your working directory for other commands
 	$(TF_BIN) --version
 	$(TF_BIN) init
 
 .PHONY: plan
-plan: tfswitch fmt ## Run '$(TF_BIN) plan', implies includes targets fmt and validate
+plan: fmt ## Run '$(TF_BIN) plan', implies includes targets fmt and validate
 	$(TF_BIN) validate; $(TF_BIN) plan
 
 .PHONY: apply
-apply: tfswitch	fmt ## Run '$(TF_BIN) apply --auto-approve' to apply changes without prompting
+apply: fmt ## Run '$(TF_BIN) apply --auto-approve' to apply changes without prompting
 	$(TF_BIN) apply --auto-approve
 
 .PHONY: update
 update: ## Run 'terraform init -upgrade' to update provider versions, see also 'lock'
 	$(TF_BIN) init -upgrade
-	test -f versions.tf && hash tfswitch 2>/dev/null && tfswitch --latest || echo tfswitch not installed
+	#test -f versions.tf && hash tfswitch 2>/dev/null && tfswitch --latest || echo tfswitch not installed
 	@echo "Finished, it's recommended to run 'make plan' now to verify if everything is still working "
 
 .PHONY: upgrade
 upgrade: update ## Alias for target 'update'
 
 .PHONY: fmt
-fmt: tfswitch ## Run 'terraform fmt -recursive' to reformat config in the the standard style
+fmt: ## Run 'terraform fmt -recursive' to reformat config in the the standard style
 	$(TF_BIN) fmt -recursive
 
 .PHONY: check
-check: tfswitch ## Run 'terraform fmt -check' to check if input is formatted, return != 0 if not
+check: ## Run 'terraform fmt -check' to check if input is formatted, return != 0 if not
 	$(TF_BIN) fmt -check
 
 .PHONY: lock