diff --git a/Makefile b/Makefile
index da95b51557..33c633b3ee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-TERRAFILE_VERSION=0.8
 ARM_TEMPLATE_TAG=1.1.6
 RG_TAGS={"Product" : "Register for National Professional Qualifications (NPQ)"}
 REGION=UK South
@@ -139,7 +138,7 @@ domains-infra-plan: domains domains-infra-init
 domains-infra-apply: domains domains-infra-init
 	terraform -chdir=terraform/domains/infrastructure apply -var-file config/zones.tfvars.json ${AUTO_APPROVE}
 
-domains-init: domains-composed-variables domains set-azure-account
+domains-init: domains domains-composed-variables set-azure-account
 	rm -rf terraform/domains/environment_domains/vendor/modules/domains
 	git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/domains/environment_domains/vendor/modules/domains
 
diff --git a/terraform/domains/environment_domains/config/production.tfvars.json b/terraform/domains/environment_domains/config/production.tfvars.json
index 32b57b7443..2e51f706fe 100644
--- a/terraform/domains/environment_domains/config/production.tfvars.json
+++ b/terraform/domains/environment_domains/config/production.tfvars.json
@@ -10,13 +10,7 @@
         "/packs/*"
       ],
       "environment_short": "pd",
-      "origin_hostname": "npq-registration-production-web.teacherservices.cloud",
-      "cnames": {
-        "_14c49b3a20d4ad049e0708795e1f8ca4": {
-          "target": "_9156bba248c12a46b784f7312750bd29.gwpjclltnz.acm-validations.aws.",
-          "ttl": 86400
-        }
-      }
+      "origin_hostname": "npq-registration-production-web.teacherservices.cloud"
     }
   }
 }
diff --git a/terraform/domains/environment_domains/config/production_Terrafile b/terraform/domains/environment_domains/config/production_Terrafile
deleted file mode 100644
index 58e60b3c88..0000000000
--- a/terraform/domains/environment_domains/config/production_Terrafile
+++ /dev/null
@@ -1,3 +0,0 @@
-domains:
-    source:  "https://github.com/DFE-Digital/terraform-modules"
-    version: "stable"
diff --git a/terraform/domains/environment_domains/config/sandbox.tfvars.json b/terraform/domains/environment_domains/config/sandbox.tfvars.json
new file mode 100644
index 0000000000..405eefc9ee
--- /dev/null
+++ b/terraform/domains/environment_domains/config/sandbox.tfvars.json
@@ -0,0 +1,16 @@
+{
+  "hosted_zone": {
+    "register-national-professional-qualifications.education.gov.uk": {
+      "front_door_name": "s189p01-cpdnpqdomains-fd",
+      "resource_group_name": "s189p01-cpdnpqdomains-rg",
+      "domains": [
+        "t"
+      ],
+      "cached_paths": [
+        "/packs/*"
+      ],
+      "environment_short": "sb",
+      "origin_hostname": "npq-registration-sandbox-web.teacherservices.cloud"
+    }
+  }
+}
diff --git a/terraform/domains/environment_domains/config/staging.tfvars.json b/terraform/domains/environment_domains/config/staging.tfvars.json
new file mode 100644
index 0000000000..d6751a40d5
--- /dev/null
+++ b/terraform/domains/environment_domains/config/staging.tfvars.json
@@ -0,0 +1,16 @@
+{
+  "hosted_zone": {
+    "register-national-professional-qualifications.education.gov.uk": {
+      "front_door_name": "s189p01-cpdnpqdomains-fd",
+      "resource_group_name": "s189p01-cpdnpqdomains-rg",
+      "domains": [
+        "x"
+      ],
+      "cached_paths": [
+        "/packs/*"
+      ],
+      "environment_short": "st",
+      "origin_hostname": "npq-registration-staging-web.test.teacherservices.cloud"
+    }
+  }
+}
diff --git a/terraform/domains/environment_domains/main.tf b/terraform/domains/environment_domains/main.tf
index a71d598022..96beb730ab 100644
--- a/terraform/domains/environment_domains/main.tf
+++ b/terraform/domains/environment_domains/main.tf
@@ -11,9 +11,3 @@ module "domains" {
   null_host_header    = try(each.value.null_host_header, false)
   cached_paths        = try(each.value.cached_paths, [])
 }
-
-# Takes values from hosted_zone.domain_name.cnames (or txt_records, a-records). Use for domains which are not associated with front door.
-module "dns_records" {
-  source      = "./vendor/modules/domains//dns/records"
-  hosted_zone = var.hosted_zone
-}
diff --git a/terraform/domains/infrastructure/config/zones_Terrafile b/terraform/domains/infrastructure/config/zones_Terrafile
deleted file mode 100644
index dfce270ef6..0000000000
--- a/terraform/domains/infrastructure/config/zones_Terrafile
+++ /dev/null
@@ -1,3 +0,0 @@
-domains:
-    source:  "https://github.com/DFE-Digital/terraform-modules"
-    version: "testing"