diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
index b9a7ae6..51c2f7e 100644
--- a/.terraform.lock.hcl
+++ b/.terraform.lock.hcl
@@ -2,25 +2,24 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/fastly/fastly" {
-  version     = "5.3.1"
-  constraints = "5.3.1"
+  version     = "5.11.0"
+  constraints = "5.11.0"
   hashes = [
-    "h1:J/H5WvnjYggHWfzlpiMaMUblgjzaE5MPydM0aOCLV/c=",
-    "h1:OZFGLNoSydPR9FGVZop9704nJRZRjM65FRq6RmZIFFM=",
-    "zh:1a5d0cd333f66aa0df26000e945df7678b045a8740921cc08f3e74412893d4f4",
-    "zh:29d9728b0195d8e16dd31816d75a5ed069b0524d5e50b04a6533f0b9177895f7",
-    "zh:2da9a3ecc0d5e3a66cb0cb5001b0c853ae22490204cc15fa14c44bbb848fcbc6",
-    "zh:4cac74c53f19f9936fa9f4d91f3c0dfb1cd506e9cc3ae0f8d546a032af21b231",
-    "zh:57321fdd5a974e4791dd4bc7c517ab898d5bb04ff0ab327556c07121077a12ff",
-    "zh:5fe05c3a6a19eb9e56c92927f97315c006e84b5aa63064faac4a372b76ec7933",
-    "zh:8da6f0a76916db3813ab5df585d9a61c8336f40843bbbaded73b35324ff8d78e",
-    "zh:9779df827e9cb3655ecd38d53fc5742e6ee864426bb3ded05e80f5113777a26c",
-    "zh:c9ff3c9a3b9e25b418cf968462f7f423e3416a0aa22a65b63b16cdeeb4015c3c",
-    "zh:cfc493b94e9ae152cdbe816ebf76382780d9c37abb4d9123f4ae21b0e110251e",
-    "zh:d4bb1f5b4925edf56fd614a90a82d51947bd360e8ce1212143fa2eda6b560bcb",
-    "zh:ddb72020404a35d6d2d7e53ac0ac51f4693a6fb9934770738e22999a501e1b6c",
-    "zh:e075d62f842eafdab9370d37b14fc96a5ca2dd77e2d68dc0b167354e29fd294c",
-    "zh:e8cd77841b0c415213a3d1bfad8692c6cd4d9bb17ffb077342b81df6a37cd14e",
+    "h1:kv4rW+6dyoJHxbZswm0vC4+e96D7NlzGo/sa6Psr4hU=",
+    "zh:0a209382e7644ceb6d0c871109cb730e772ac436f63a5c5814d12a476cc72986",
+    "zh:38efbb97d1aa2ae056fd9f8189a4773e29140af4a2a6d42fa37ae67a549c7649",
+    "zh:59bc24ff24197fd1bf428aa6ac213ea07ddea9ca33f71c3916578c7983e834c6",
+    "zh:66685d0635de949de8d9d685ea46c8714e06833cb2817e06284e278ecbad29cd",
+    "zh:71bbd37e880007c0bc3838dbb58847a7b6470c12d2278f91095c735760df0138",
+    "zh:7f74a806b384682e9f8d359b03e61904a45c4e618207edc31aeae2430daa21d6",
+    "zh:8114e395890a44973e08d134b057014c493a70087bd7e757fa6a680e5109f4a1",
+    "zh:8b4fd50aea90cda18519ba260f295afa4d55bdd951daca4c4bffb10e7920796f",
+    "zh:9783df35130f247ce8e58fc9ec601aeabd4cce065c382795e10a6503c7b42053",
+    "zh:d7c1323e48d323eef73ad1c84dcb5fbdfa4a79953337582e4f995dab73bf69df",
+    "zh:d938c14524d6c868c5a5803dcd572a0beb38f39059685f3222b9a465c08eda2d",
+    "zh:e8dfdf179c442cfe00c2981d0d997488eb9ca207226f9549e9bd3a258e783d2e",
+    "zh:f756a5fe204792ca10b0d2416491741b4199324bd6019706a65abfce78a4fcc7",
+    "zh:f9341da542f8dcd5c3ac1011fb937df596a0176f594dc0cb93a424fbcabb2ae2",
   ]
 }
 
diff --git a/main.tf b/main.tf
index a26ceb1..67bcfb0 100644
--- a/main.tf
+++ b/main.tf
@@ -5,10 +5,11 @@ terraform {
       name = "govuk-fastly"
     }
   }
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
       source  = "fastly/fastly"
-      version = "5.3.1"
+      version = "5.11.0"
     }
   }
 }
diff --git a/modules/assets/service.tf b/modules/assets/main.tf
similarity index 99%
rename from modules/assets/service.tf
rename to modules/assets/main.tf
index 3705ade..37fad43 100644
--- a/modules/assets/service.tf
+++ b/modules/assets/main.tf
@@ -25,7 +25,7 @@ locals {
       gcs_mirror_port            = 443
     },
     { # computed values
-      module_path = "${path.module}"
+      module_path = path.module
     },
     var.configuration,
     var.secrets
diff --git a/modules/assets/outputs.tf b/modules/assets/outputs.tf
new file mode 100644
index 0000000..e69de29
diff --git a/modules/assets/provider.tf b/modules/assets/provider.tf
index f715a99..47c6ee4 100644
--- a/modules/assets/provider.tf
+++ b/modules/assets/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
   }
 }
diff --git a/modules/assets/variables.tf b/modules/assets/variables.tf
index de5f012..9385d9f 100644
--- a/modules/assets/variables.tf
+++ b/modules/assets/variables.tf
@@ -11,5 +11,6 @@ variable "dictionaries" {
 }
 
 variable "vcl_template_file" {
+  type    = string
   default = "assets.vcl.tftpl"
 }
diff --git a/modules/bouncer/service.tf b/modules/bouncer/main.tf
similarity index 98%
rename from modules/bouncer/service.tf
rename to modules/bouncer/main.tf
index 4e32e92..189310c 100644
--- a/modules/bouncer/service.tf
+++ b/modules/bouncer/main.tf
@@ -28,7 +28,7 @@ resource "fastly_service_vcl" "service" {
     name = "main"
     content = templatefile("${path.module}/${var.vcl_template_file}", {
       domain      = var.domain,
-      module_path = "${path.module}"
+      module_path = path.module
     })
   }
 
diff --git a/modules/bouncer/outputs.tf b/modules/bouncer/outputs.tf
new file mode 100644
index 0000000..e69de29
diff --git a/modules/bouncer/provider.tf b/modules/bouncer/provider.tf
index 3229e8c..2487e78 100644
--- a/modules/bouncer/provider.tf
+++ b/modules/bouncer/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
     http = {
       source  = "hashicorp/http"
diff --git a/modules/datagovuk/service.tf b/modules/datagovuk/main.tf
similarity index 99%
rename from modules/datagovuk/service.tf
rename to modules/datagovuk/main.tf
index 86acb99..52e80a5 100644
--- a/modules/datagovuk/service.tf
+++ b/modules/datagovuk/main.tf
@@ -35,7 +35,7 @@ locals {
     },
     { # computed values
       formatted_allowed_ip_addresses = local.formatted_allowed_ips
-      module_path                    = "${path.module}"
+      module_path                    = path.module
     },
     var.configuration,
     var.secrets
diff --git a/modules/datagovuk/outputs.tf b/modules/datagovuk/outputs.tf
new file mode 100644
index 0000000..e69de29
diff --git a/modules/datagovuk/provider.tf b/modules/datagovuk/provider.tf
index f715a99..47c6ee4 100644
--- a/modules/datagovuk/provider.tf
+++ b/modules/datagovuk/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
   }
 }
diff --git a/modules/datagovuk/variables.tf b/modules/datagovuk/variables.tf
index d3d10bd..77f9653 100644
--- a/modules/datagovuk/variables.tf
+++ b/modules/datagovuk/variables.tf
@@ -11,5 +11,6 @@ variable "dictionaries" {
 }
 
 variable "vcl_template_file" {
+  type    = string
   default = "datagovuk.vcl.tftpl"
 }
diff --git a/modules/service-domain-redirect/service.tf b/modules/service-domain-redirect/main.tf
similarity index 100%
rename from modules/service-domain-redirect/service.tf
rename to modules/service-domain-redirect/main.tf
diff --git a/modules/service-domain-redirect/outputs.tf b/modules/service-domain-redirect/outputs.tf
new file mode 100644
index 0000000..e69de29
diff --git a/modules/service-domain-redirect/provider.tf b/modules/service-domain-redirect/provider.tf
index f715a99..47c6ee4 100644
--- a/modules/service-domain-redirect/provider.tf
+++ b/modules/service-domain-redirect/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
   }
 }
diff --git a/modules/service-domain-redirect/variables.tf b/modules/service-domain-redirect/variables.tf
new file mode 100644
index 0000000..e69de29
diff --git a/modules/tld-redirect/service.tf b/modules/tld-redirect/main.tf
similarity index 100%
rename from modules/tld-redirect/service.tf
rename to modules/tld-redirect/main.tf
diff --git a/modules/tld-redirect/outputs.tf b/modules/tld-redirect/outputs.tf
new file mode 100644
index 0000000..e69de29
diff --git a/modules/tld-redirect/provider.tf b/modules/tld-redirect/provider.tf
index f715a99..47c6ee4 100644
--- a/modules/tld-redirect/provider.tf
+++ b/modules/tld-redirect/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
   }
 }
diff --git a/modules/tld-redirect/variables.tf b/modules/tld-redirect/variables.tf
new file mode 100644
index 0000000..e69de29
diff --git a/modules/www/service.tf b/modules/www/main.tf
similarity index 100%
rename from modules/www/service.tf
rename to modules/www/main.tf
diff --git a/modules/www/outputs.tf b/modules/www/outputs.tf
new file mode 100644
index 0000000..e69de29
diff --git a/modules/www/provider.tf b/modules/www/provider.tf
index f715a99..47c6ee4 100644
--- a/modules/www/provider.tf
+++ b/modules/www/provider.tf
@@ -1,7 +1,9 @@
 terraform {
+  required_version = "~> 1.7"
   required_providers {
     fastly = {
-      source = "fastly/fastly"
+      source  = "fastly/fastly"
+      version = "5.11.0"
     }
   }
 }
diff --git a/modules/www/variables.tf b/modules/www/variables.tf
index 2c36404..1f5d494 100644
--- a/modules/www/variables.tf
+++ b/modules/www/variables.tf
@@ -11,5 +11,6 @@ variable "dictionaries" {
 }
 
 variable "vcl_template_file" {
+  type    = string
   default = "www.vcl.tftpl"
 }
diff --git a/outputs.tf b/outputs.tf
new file mode 100644
index 0000000..e69de29