diff --git a/terraform/nowcasting/production/main.tf b/terraform/nowcasting/production/main.tf
index 3407c4f1..bdd51165 100644
--- a/terraform/nowcasting/production/main.tf
+++ b/terraform/nowcasting/production/main.tf
@@ -17,9 +17,9 @@ The componentes ares:
 3.4 - Satellite Consumer
 3.5 - Satellite Data Tailor Clean up
 3.6 - PV Consumer
-3.7 - GSP Consumer (From PVLive)
-3.8 - GSP Consumer - GSP Day After
-3.9 - GSP Consumer - National Day After
+3.7 - PVLive Consumer (From PVLive)
+3.8 - PVLive Consumer - GSP Day After
+3.9 - PVLive Consumer - National Day After
 4.1 - Metrics
 4.2 - Forecast PVnet 1
 4.3 - Forecast National XG
@@ -336,7 +336,7 @@ module "pv" {
 module "gsp-consumer" {
   source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/ecs_task?ref=f2296a4"
 
-  ecs-task_name = "gsp"
+  ecs-task_name = "pvlive"
   ecs-task_type = "consumer"
   ecs-task_execution_role_arn = module.ecs.ecs_task_execution_role_arn
   ecs-task_size = {
@@ -362,7 +362,7 @@ module "gsp-consumer" {
   values: ["DB_URL"]}
   ]
   container-tag         = var.gsp_version
-  container-name        = "openclimatefix/gspconsumer"
+  container-name        = "openclimatefix/pvliveconsumer"
   container-registry = "docker.io"
   container-command     = []
 }
@@ -371,7 +371,7 @@ module "gsp-consumer" {
 module "gsp-consumer-day-after-gsp" {
   source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/ecs_task?ref=f2296a4"
 
-  ecs-task_name = "gsp-day-after"
+  ecs-task_name = "pvlive-gsp-day-after"
   ecs-task_type = "consumer"
   ecs-task_execution_role_arn = module.ecs.ecs_task_execution_role_arn
   ecs-task_size = {
@@ -397,7 +397,7 @@ module "gsp-consumer-day-after-gsp" {
   values: ["DB_URL"]}
   ]
   container-tag         = var.gsp_version
-  container-name        = "openclimatefix/gspconsumer"
+  container-name        = "openclimatefix/pvliveconsumer"
   container-registry = "docker.io"
   container-command     = []
 }
@@ -406,7 +406,7 @@ module "gsp-consumer-day-after-gsp" {
 module "gsp-consumer-day-after-national" {
   source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/ecs_task?ref=f2296a4"
 
-  ecs-task_name = "national-day-after"
+  ecs-task_name = "pvlive-national-day-after"
   ecs-task_type = "consumer"
   ecs-task_execution_role_arn = module.ecs.ecs_task_execution_role_arn
   ecs-task_size = {
@@ -432,7 +432,7 @@ module "gsp-consumer-day-after-national" {
   values: ["DB_URL"]}
   ]
   container-tag         = var.gsp_version
-  container-name        = "openclimatefix/gspconsumer"
+  container-name        = "openclimatefix/pvliveconsumer"
   container-registry = "docker.io"
   container-command     = []
 }
@@ -681,7 +681,7 @@ module "forecast_blend" {
 
 # 5.2
 module "airflow" {
-  source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/airflow?ref=2c9c35f"
+  source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/airflow?ref=4d6eadd"
 
   aws-environment   = local.environment
   aws-domain        = local.domain