diff --git a/infra/local/bootstrap/terragrunt.hcl b/infra/local/bootstrap/terragrunt.hcl
index f3bcb2a..7683bc0 100644
--- a/infra/local/bootstrap/terragrunt.hcl
+++ b/infra/local/bootstrap/terragrunt.hcl
@@ -3,7 +3,7 @@ include "root" {
 }
 
 terraform {
-  source = "../../.modules/bootstrap"
+  source = find_in_parent_folders(".modules")//bootstrap"
 }
 
 dependency "cluster" {
diff --git a/infra/local/cluster/terragrunt.hcl b/infra/local/cluster/terragrunt.hcl
index 4786b7f..ac4538a 100644
--- a/infra/local/cluster/terragrunt.hcl
+++ b/infra/local/cluster/terragrunt.hcl
@@ -3,7 +3,7 @@ include "root" {
 }
 
 terraform {
-  source = "../../.modules/local-cluster"
+  source = find_in_parent_folders(".modules")//local-cluster"
 }
 
 inputs = {
diff --git a/infra/production/hetzner/helsinki/compute/configuration.nix b/infra/production/hetzner/helsinki/compute/hetzner-vm/configuration.nix
similarity index 100%
rename from infra/production/hetzner/helsinki/compute/configuration.nix
rename to infra/production/hetzner/helsinki/compute/hetzner-vm/configuration.nix
diff --git a/infra/production/hetzner/helsinki/compute/flake.lock b/infra/production/hetzner/helsinki/compute/hetzner-vm/flake.lock
similarity index 100%
rename from infra/production/hetzner/helsinki/compute/flake.lock
rename to infra/production/hetzner/helsinki/compute/hetzner-vm/flake.lock
diff --git a/infra/production/hetzner/helsinki/compute/flake.nix b/infra/production/hetzner/helsinki/compute/hetzner-vm/flake.nix
similarity index 100%
rename from infra/production/hetzner/helsinki/compute/flake.nix
rename to infra/production/hetzner/helsinki/compute/hetzner-vm/flake.nix
diff --git a/infra/production/hetzner/helsinki/compute/main.tf b/infra/production/hetzner/helsinki/compute/hetzner-vm/main.tf
similarity index 100%
rename from infra/production/hetzner/helsinki/compute/main.tf
rename to infra/production/hetzner/helsinki/compute/hetzner-vm/main.tf
diff --git a/infra/production/hetzner/helsinki/compute/outputs.tf b/infra/production/hetzner/helsinki/compute/hetzner-vm/outputs.tf
similarity index 100%
rename from infra/production/hetzner/helsinki/compute/outputs.tf
rename to infra/production/hetzner/helsinki/compute/hetzner-vm/outputs.tf
diff --git a/infra/production/hetzner/helsinki/compute/variables.tf b/infra/production/hetzner/helsinki/compute/hetzner-vm/variables.tf
similarity index 100%
rename from infra/production/hetzner/helsinki/compute/variables.tf
rename to infra/production/hetzner/helsinki/compute/hetzner-vm/variables.tf
diff --git a/infra/production/hetzner/helsinki/compute/versions.tf b/infra/production/hetzner/helsinki/compute/hetzner-vm/versions.tf
similarity index 100%
rename from infra/production/hetzner/helsinki/compute/versions.tf
rename to infra/production/hetzner/helsinki/compute/hetzner-vm/versions.tf
diff --git a/infra/production/hetzner/helsinki/compute/terragrunt.hcl b/infra/production/hetzner/helsinki/compute/terragrunt.hcl
index 8127cde..1687a63 100644
--- a/infra/production/hetzner/helsinki/compute/terragrunt.hcl
+++ b/infra/production/hetzner/helsinki/compute/terragrunt.hcl
@@ -1,8 +1,11 @@
 terraform {
   # TODO move to modules
-  source = "."
+  source = "./hetzner-vm"
 }
 
+# TODO temp skip
+skip = true
+
 inputs = {
   nodes = {
     "master-1" = {
diff --git a/infra/production/oracle/bootstrap/terragrunt.hcl b/infra/production/oracle/bootstrap/terragrunt.hcl
index 379dfaf..afaa8e8 100644
--- a/infra/production/oracle/bootstrap/terragrunt.hcl
+++ b/infra/production/oracle/bootstrap/terragrunt.hcl
@@ -3,7 +3,7 @@ include "root" {
 }
 
 terraform {
-  source = "../../../.modules//bootstrap"
+  source = find_in_parent_folders(".modules")//bootstrap"
 }
 
 dependency "cluster" {
diff --git a/infra/production/oracle/cluster/terragrunt.hcl b/infra/production/oracle/cluster/terragrunt.hcl
index 894f447..e289e37 100644
--- a/infra/production/oracle/cluster/terragrunt.hcl
+++ b/infra/production/oracle/cluster/terragrunt.hcl
@@ -4,7 +4,7 @@ include "root" {
 }
 
 terraform {
-  source = "../../../.modules//cluster"
+  source = find_in_parent_folders(".modules")//cluster"
 }
 
 dependency "legacy" {
diff --git a/infra/production/oracle/legacy/terragrunt.hcl b/infra/production/oracle/legacy/terragrunt.hcl
index b368139..8d6d018 100644
--- a/infra/production/oracle/legacy/terragrunt.hcl
+++ b/infra/production/oracle/legacy/terragrunt.hcl
@@ -4,7 +4,7 @@ include "root" {
 }
 
 terraform {
-  source = "../../../.modules//legacy"
+  source = find_in_parent_folders(".modules")//legacy"
 }
 
 inputs = {
diff --git a/infra/production/oracle/secrets/terragrunt.hcl b/infra/production/oracle/secrets/terragrunt.hcl
index 068bfca..ec265a7 100644
--- a/infra/production/oracle/secrets/terragrunt.hcl
+++ b/infra/production/oracle/secrets/terragrunt.hcl
@@ -4,7 +4,7 @@ include "root" {
 }
 
 terraform {
-  source = "../../../.modules//secrets"
+  source = find_in_parent_folders(".modules")//secrets"
 }
 
 dependency "cluster" {
diff --git a/infra/production/tfstate/terragrunt.hcl b/infra/production/tfstate/terragrunt.hcl
index b949bae..0ba7931 100644
--- a/infra/production/tfstate/terragrunt.hcl
+++ b/infra/production/tfstate/terragrunt.hcl
@@ -4,7 +4,7 @@ include "root" {
 }
 
 terraform {
-  source = "../../.modules//tfstate"
+  source = find_in_parent_folders(".modules")//tfstate"
 
   before_hook "bootstrap_tfstate" {
     commands = ["init", "plan", "apply"]