diff --git a/.github/workflows/_build_image.yml b/.github/workflows/_build_image.yml
index 34a4c6a9..1008d592 100644
--- a/.github/workflows/_build_image.yml
+++ b/.github/workflows/_build_image.yml
@@ -29,8 +29,6 @@ on:
         required: true
       AWS_SECRET_ACCESS_KEY:
         required: true
-      AWS_ACCOUNT_ID:
-        required: true
       AWS_REGION:
           required: true
 
@@ -56,7 +54,11 @@ jobs:
       - name: Build & push image
         run: |
           IMAGE_TAG=${GITHUB_SHA}
-          IMAGE_URI=${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/${{ inputs.ecr_repo }}:${IMAGE_TAG}
+          AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+
+          IMAGE_URI=${AWS_ACCOUNT_ID}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/${{ inputs.ecr_repo }}:${IMAGE_TAG}
+
+          echo "Using IMAGE_URI=$IMAGE_URI"
 
           docker build \
             -f ${{ inputs.dockerfile_path }} \
diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml
index ab7c4df3..4713c8c7 100644
--- a/.github/workflows/deploy_terraform.yml
+++ b/.github/workflows/deploy_terraform.yml
@@ -81,7 +81,6 @@ jobs:
     secrets:
       AWS_ACCESS_KEY_ID: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
-      AWS_ACCOUNT_ID: ${{ secrets.DEV_AWS_ACCOUNT_ID }}
       AWS_REGION: ${{ secrets.DEV_AWS_REGION }}