diff --git a/infra/shell.nix b/infra/terraform/shell.nix
similarity index 100%
rename from infra/shell.nix
rename to infra/terraform/shell.nix
diff --git a/infra/terraform.tf b/infra/terraform/terraform.tf
similarity index 73%
rename from infra/terraform.tf
rename to infra/terraform/terraform.tf
index 7b87ea30..6f5e3719 100644
--- a/infra/terraform.tf
+++ b/infra/terraform/terraform.tf
@@ -41,3 +41,19 @@ resource "hcloud_server" "stfmaster" {
   delete_protection  = true
   rebuild_protection = true
 }
+
+resource "hcloud_server" "straging_tracker" {
+  name        = "staging-security-tracker"
+  image       = "debian-12"
+  server_type = "cpx41"
+  public_net {
+    ipv4_enabled = true
+    ipv6_enabled = true
+  }
+  datacenter = "nbg1-dc3"
+  labels = {
+    "Managed-by" : "Terraform"
+  }
+  delete_protection  = true
+  rebuild_protection = true
+}