diff --git a/terraform/stacks/umccr_data_portal/cicd.tf b/terraform/stacks/umccr_data_portal/cicd.tf
index de00de38..b2d0686c 100644
--- a/terraform/stacks/umccr_data_portal/cicd.tf
+++ b/terraform/stacks/umccr_data_portal/cicd.tf
@@ -291,8 +291,8 @@ resource "aws_codebuild_project" "codebuild_client" {
 
   environment {
     compute_type = "BUILD_GENERAL1_SMALL"
-    image        = "aws/codebuild/amazonlinux2-aarch64-standard:3.0"
-    type         = "ARM_CONTAINER"
+    image        = "aws/codebuild/standard:7.0"
+    type         = "LINUX_CONTAINER"
 
     environment_variable {
       name  = "STAGE"
@@ -375,8 +375,8 @@ resource "aws_codebuild_project" "codebuild_apis" {
 
   environment {
     compute_type    = "BUILD_GENERAL1_SMALL"
-    image           = "aws/codebuild/amazonlinux2-aarch64-standard:3.0"
-    type            = "ARM_CONTAINER"
+    image           = "aws/codebuild/standard:7.0"
+    type            = "LINUX_CONTAINER"
     privileged_mode = true
 
     environment_variable {
diff --git a/terraform/stacks/umccr_data_portal/data2.tf b/terraform/stacks/umccr_data_portal/data2.tf
index 9f275b64..7f9c2305 100644
--- a/terraform/stacks/umccr_data_portal/data2.tf
+++ b/terraform/stacks/umccr_data_portal/data2.tf
@@ -265,8 +265,8 @@ resource "aws_codebuild_project" "codebuild_data2" {
 
   environment {
     compute_type = "BUILD_GENERAL1_SMALL"
-    image        = "aws/codebuild/amazonlinux2-aarch64-standard:3.0"
-    type         = "ARM_CONTAINER"
+    image        = "aws/codebuild/standard:7.0"
+    type         = "LINUX_CONTAINER"
 
     environment_variable {
       name  = "STAGE"