diff --git a/infrastructure/stacks/development-and-deployment-tools/buildspecs/production-smoke-test-buildspec.yml b/infrastructure/stacks/development-and-deployment-tools/buildspecs/production-smoke-test-buildspec.yml
index b5fc2899d..ae73fd23e 100644
--- a/infrastructure/stacks/development-and-deployment-tools/buildspecs/production-smoke-test-buildspec.yml
+++ b/infrastructure/stacks/development-and-deployment-tools/buildspecs/production-smoke-test-buildspec.yml
@@ -9,7 +9,10 @@ phases:
       - export AWS_SECRET_ACCESS_KEY=$(echo $temp_role | jq -r .Credentials.SecretAccessKey)
       - export AWS_SESSION_TOKEN=$(echo $temp_role | jq -r .Credentials.SessionToken)
       - make docker-hub-signin
-      - make docker-pull NAME=tester
+      # - make docker-pull NAME=tester
+      # Using digest to handle image arch issue in smoke test stage for no arm terraform image in v1.2.1
+      - make docker-pull NAME=tester DIGEST=sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c
+      - docker tag $(make _docker-get-reg)/tester@sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c $(make _docker-get-reg)/tester:latest
       - unset AWS_ACCESS_KEY_ID
       - unset AWS_SECRET_ACCESS_KEY
       - unset AWS_SESSION_TOKEN
diff --git a/infrastructure/stacks/development-and-deployment-tools/pipeline_stages.tf b/infrastructure/stacks/development-and-deployment-tools/pipeline_stages.tf
index c375c0fb7..4fc9ce3bd 100644
--- a/infrastructure/stacks/development-and-deployment-tools/pipeline_stages.tf
+++ b/infrastructure/stacks/development-and-deployment-tools/pipeline_stages.tf
@@ -350,8 +350,8 @@ resource "aws_codebuild_project" "production_smoke_test" {
 
   environment {
     compute_type                = "BUILD_GENERAL1_SMALL"
-    image                       = "aws/codebuild/amazonlinux2-aarch64-standard:3.0"
-    type                        = "ARM_CONTAINER"
+    image                       = "aws/codebuild/amazonlinux2-x86_64-standard:5.0"
+    type                        = "LINUX_CONTAINER"
     image_pull_credentials_type = "CODEBUILD"
     privileged_mode             = true