diff --git a/commonimages/base/main.tf b/commonimages/base/main.tf
index f3426cd5..bf1d5073 100644
--- a/commonimages/base/main.tf
+++ b/commonimages/base/main.tf
@@ -23,4 +23,4 @@ module "imagebuilder" {
   systems_manager_agent           = var.systems_manager_agent
   branch                          = var.BRANCH_NAME
   gh_actor                        = var.GH_ACTOR_NAME
-}
\ No newline at end of file
+}
diff --git a/commonimages/base/ol_8_5/README.md b/commonimages/base/ol_8_5/README.md
index bd52e77f..2a93105d 100644
--- a/commonimages/base/ol_8_5/README.md
+++ b/commonimages/base/ol_8_5/README.md
@@ -1,2 +1,5 @@
 # Overview
 This directory holds represents definition and configuration required to build an Oracle Linux 8.5 base AMI.
+
+NOTE: Parent 8.5 AMI no longer exists so pipeline is broken
+FIXME: https://dsdmoj.atlassian.net/browse/DSOS-2558
diff --git a/commonimages/base/ol_8_5/terraform.tfvars b/commonimages/base/ol_8_5/terraform.tfvars
index 887c9cad..b32de44f 100644
--- a/commonimages/base/ol_8_5/terraform.tfvars
+++ b/commonimages/base/ol_8_5/terraform.tfvars
@@ -1,7 +1,7 @@
 # following are passed in via pipeline
 # BRANCH_NAME =  
 # GH_ACTOR_NAME = 
-configuration_version = "0.0.7"
+configuration_version = "0.0.8"
 description           = "shared oracle linux 8.5 base image"
 
 ami_base_name = "ol_8_5"
diff --git a/commonimages/base/ol_8_5/terragrunt.hcl b/commonimages/base/ol_8_5/terragrunt.hcl.disabled
similarity index 100%
rename from commonimages/base/ol_8_5/terragrunt.hcl
rename to commonimages/base/ol_8_5/terragrunt.hcl.disabled
diff --git a/commonimages/base/rhel_6_10/terraform.tfvars b/commonimages/base/rhel_6_10/terraform.tfvars
index b762a0af..b9ef201b 100644
--- a/commonimages/base/rhel_6_10/terraform.tfvars
+++ b/commonimages/base/rhel_6_10/terraform.tfvars
@@ -2,7 +2,7 @@
 # BRANCH_NAME =
 # GH_ACTOR_NAME =
 
-configuration_version = "0.2.6"
+configuration_version = "0.2.7"
 description           = "shared rhel 6.10 base image"
 
 ami_base_name = "rhel_6_10"
diff --git a/commonimages/base/rhel_7_9/terraform.tfvars b/commonimages/base/rhel_7_9/terraform.tfvars
index 2621ab96..b39053ac 100644
--- a/commonimages/base/rhel_7_9/terraform.tfvars
+++ b/commonimages/base/rhel_7_9/terraform.tfvars
@@ -1,7 +1,7 @@
 # following are passed in via pipeline
 # BRANCH_NAME =  
 # GH_ACTOR_NAME = 
-configuration_version = "0.1.1"
+configuration_version = "0.1.2"
 description           = "shared rhel 7.9 base image"
 
 ami_base_name = "rhel_7_9"
diff --git a/commonimages/base/rhel_8_5/terraform.tfvars b/commonimages/base/rhel_8_5/terraform.tfvars
index d874d269..81d3faf5 100644
--- a/commonimages/base/rhel_8_5/terraform.tfvars
+++ b/commonimages/base/rhel_8_5/terraform.tfvars
@@ -1,7 +1,7 @@
 # following are passed in via pipeline
 # BRANCH_NAME =  
 # GH_ACTOR_NAME = 
-configuration_version = "0.0.9"
+configuration_version = "0.1.0"
 description           = "shared rhel 8.5 base image"
 
 ami_base_name = "rhel_8_5"
diff --git a/commonimages/base/shared.auto.tfvars b/commonimages/base/shared.auto.tfvars
index ec9d351d..67d7fb3b 100644
--- a/commonimages/base/shared.auto.tfvars
+++ b/commonimages/base/shared.auto.tfvars
@@ -20,7 +20,10 @@ launch_permission_account_names = [
   "hmpps-oem-preproduction",
   "hmpps-oem-production",
   "hmpps-oem-test",
+  "hmpps-domain-services-development",
   "hmpps-domain-services-test",
+  "hmpps-domain-services-preproduction",
+  "hmpps-domain-services-production",
   "nomis-combined-reporting-development",
   "nomis-combined-reporting-preproduction",
   "nomis-combined-reporting-production",
diff --git a/commonimages/base/windows_2012_r2/terraform.tfvars b/commonimages/base/windows_2012_r2/terraform.tfvars
index 5b2c7191..149b5432 100644
--- a/commonimages/base/windows_2012_r2/terraform.tfvars
+++ b/commonimages/base/windows_2012_r2/terraform.tfvars
@@ -4,7 +4,7 @@
 
 region                = "eu-west-2"
 ami_base_name         = "windows_server_2012_r2"
-configuration_version = "0.1.2"
+configuration_version = "0.1.3"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "Windows Server 2012 R2"
 
diff --git a/commonimages/base/windows_2012_r2_SQL_2014/README.md b/commonimages/base/windows_2012_r2_SQL_2014/README.md
new file mode 100644
index 00000000..310fd694
--- /dev/null
+++ b/commonimages/base/windows_2012_r2_SQL_2014/README.md
@@ -0,0 +1,4 @@
+This AMI is currently broken due to parent_image configuration
+The AMI was intended for PlanetFM but AWS Migration tool used instead
+
+FIXME: https://dsdmoj.atlassian.net/browse/DSOS-2557
diff --git a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars
index 1896983d..41f67890 100644
--- a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars
+++ b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars
@@ -4,7 +4,7 @@
 
 region                = "eu-west-2"
 ami_base_name         = "windows_server_2012_r2_SQL_2014_enterprise"
-configuration_version = "0.0.6"
+configuration_version = "0.0.7"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "Windows Server 2012 R2 with SQL 2014 Enterprise"
 
diff --git a/commonimages/base/windows_2012_r2_SQL_2014/terragrunt.hcl b/commonimages/base/windows_2012_r2_SQL_2014/terragrunt.hcl.disabled
similarity index 100%
rename from commonimages/base/windows_2012_r2_SQL_2014/terragrunt.hcl
rename to commonimages/base/windows_2012_r2_SQL_2014/terragrunt.hcl.disabled