diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c72e23..161bc83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,14 @@
 default:
   image: ghcr.io/vojtechmares/container-images/tfenv:sha-32fe5b4f990b687bb05717255bc1c9febd4f282e
   cache:
-    key: $CI_COMMIT_BRANCH
+    key: terraform
     paths:
-      - $CI_PROJECT_DIR/.terraform
+      - .terraform
+      - /opt/tfenv
 
 stages:
   - init
+  - format
   - validate
   - plan
   - apply
@@ -17,20 +19,20 @@ variables:
 
 init:
   stage: init
+  before_script:
+    - tfenv install
+    - tfenv use
   script:
     - terraform init
 
 format:
-  stage: validate
+  stage: format
   script:
     - terraform fmt -check -recursive -diff
 
 validate:
   stage: validate
   script:
-    - ls -la
-    - test -d .terraform
-    - test -d .terraform/providers
     - terraform validate
 
 plan:
diff --git a/.terraform-version b/.terraform-version
index 943f9cb..bd8bf88 100644
--- a/.terraform-version
+++ b/.terraform-version
@@ -1 +1 @@
-1.7.1
+1.7.0
diff --git a/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
similarity index 91%
rename from .terraform.lock.hcl
rename to terraform/.terraform.lock.hcl
index e5301b1..7915f68 100644
--- a/.terraform.lock.hcl
+++ b/terraform/.terraform.lock.hcl
@@ -6,8 +6,6 @@ provider "registry.terraform.io/cloudflare/cloudflare" {
   constraints = "4.19.0"
   hashes = [
     "h1:3EZM8zAObdA81PcyXyiic4y2aZsTowYKG29RjZKXbJU=",
-    "h1:JLYiArMIeU5gf/2jEbyijUBxuR1BeJCZRjUwe2bkr44=",
-    "h1:tgDfKsBL4SxCgq3sz28oLZ2q+Elzlt1Anpkm7kVC3q8=",
     "zh:1d5315dcbd8187a3a978dc1fb08e80b6cdd353de10afe531b3d1ecb834d0dbae",
     "zh:2a6e5b2e5072e442b35ce6142172e15afb835e16799d04a0054a79d3067f7560",
     "zh:308c5690024a1f6797300018456a1ac781c8699fa4bc4892a8c36eb992604a26",
@@ -30,8 +28,6 @@ provider "registry.terraform.io/hashicorp/random" {
   version = "3.6.0"
   hashes = [
     "h1:I8MBeauYA8J8yheLJ8oSMWqB0kovn16dF/wKZ1QTdkk=",
-    "h1:R5Ucn26riKIEijcsiOMBR3uOAjuOMfI1x7XvH4P6B1w=",
-    "h1:p6WG1IPHnqx1fnJVKNjv733FBaArIugqy58HRZnpPCk=",
     "zh:03360ed3ecd31e8c5dac9c95fe0858be50f3e9a0d0c654b5e504109c2159287d",
     "zh:1c67ac51254ba2a2bb53a25e8ae7e4d076103483f55f39b426ec55e47d1fe211",
     "zh:24a17bba7f6d679538ff51b3a2f378cedadede97af8a1db7dad4fd8d6d50f829",
@@ -51,8 +47,6 @@ provider "registry.terraform.io/hetznercloud/hcloud" {
   version     = "1.44.1"
   constraints = "1.44.1"
   hashes = [
-    "h1:Mw1Fn9EHSzK+SzueUUwizpOpiDAm/UlOELTidQRB47Y=",
-    "h1:Pb9pYnJaMf7tURy6sMx6d6vJX7WFOZDIMYGjlsL0vAY=",
     "h1:q2JvvbG+seeZ4A2ijxPi5Tis+NJVoB59cAt3KeQe0uA=",
     "zh:156df81d2c740608b9fb7f439defbb39b89585c55dc6e62e4af928808ff67f9e",
     "zh:32407f1df8b59afe5e35710c4acf2c8a8cbf5ea9a32126f34cb0c49ff142a047",