diff --git a/infrastructure/Makefile b/infrastructure/Makefile
index 129a367..41847f5 100644
--- a/infrastructure/Makefile
+++ b/infrastructure/Makefile
@@ -17,7 +17,8 @@
 .PHONY: apply destroy-backend destroy destroy-target plan-destroy plan plan-target prep
 
 -include Makefile.env
-VARS="variables/$(ENV)-$(REGION).tfvars"
+# VARS="variables/$(ENV)-$(REGION).tfvars"
+VARS="$(ENV)-$(REGION).tfvars"
 CURRENT_FOLDER=$(shell basename "$$(pwd)")
 S3_BUCKET="$(ENV)-$(REGION)-$(PROJECT)-terraform"
 DYNAMODB_TABLE="$(ENV)-$(REGION)-$(PROJECT)-terraform"
diff --git a/infrastructure/main.tf b/infrastructure/main.tf
index 8ccdb20..c22cd27 100644
--- a/infrastructure/main.tf
+++ b/infrastructure/main.tf
@@ -85,9 +85,9 @@ data "archive_file" "lambda_main" {
 # }
 
 resource "aws_lambda_function" "directory_indexes" {
-  provider      = aws.us_east_1
-  function_name = "${var.stage}-${var.name}-directory_indexes"
-  filename      = "${var.source_file}.zip"
+  provider         = aws.us_east_1
+  function_name    = "${var.stage}-${var.name}-directory_indexes"
+  filename         = "${var.source_file}.zip"
   source_code_hash = data.archive_file.lambda_main.output_base64sha256
   # s3_bucket     = aws_s3_bucket.lambda_s3.id
   # s3_key        = var.lambda_key
diff --git a/infrastructure/variables/prod-eu-west-1.tfvars b/infrastructure/prod-eu-west-1.tfvars
similarity index 100%
rename from infrastructure/variables/prod-eu-west-1.tfvars
rename to infrastructure/prod-eu-west-1.tfvars