diff --git a/terraform/codebase-pipelines/ecr.tf b/terraform/codebase-pipelines/ecr.tf
index 2dd3af2f1..86872d089 100644
--- a/terraform/codebase-pipelines/ecr.tf
+++ b/terraform/codebase-pipelines/ecr.tf
@@ -25,11 +25,7 @@ data "aws_iam_policy_document" "ecr_policy" {
     actions = [
       "ecr:BatchCheckLayerAvailability",
       "ecr:BatchGetImage",
-      "ecr:CompleteLayerUpload",
       "ecr:GetDownloadUrlForLayer",
-      "ecr:InitiateLayerUpload",
-      "ecr:PutImage",
-      "ecr:UploadLayerPart"
     ]
 
     principals {
@@ -41,6 +37,66 @@ data "aws_iam_policy_document" "ecr_policy" {
     }
   }
 
+  statement {
+    effect = "Allow"
+    sid    = "allowECRAuthentication"
+    actions = [
+      "ecr:GetAuthorizationToken"
+    ]
+    resources = "*"
+  }
+
+  statement {
+    sid    = "AllowImagePull"
+    effect = "Allow"
+    actions = [
+      "ecr:BatchGetImage",
+      "ecr:BatchCheckLayerAvailability",
+      "ecr:GetDownloadUrlForLayer"
+    ]
+    resources = [
+      "arn:aws:ecr:eu-west-2:${id}:repository/${locals.ecr_name}",
+    ]
+  }
+
+  statement {
+    sid    = "AllowSignatureRevokeCheck"
+    effect = "Allow"
+    actions = [
+      "signer:GetRevocationStatus"
+    ]
+    resources = [
+      "*"
+    ]
+  }
+
+  statement {
+    effect = "Allow"
+    sid    = "PushActions"
+
+    actions = [
+      "ecr:CompleteLayerUpload",
+      "ecr:InitiateLayerUpload",
+      "ecr:PutImage",
+      "ecr:UploadLayerPart"
+    ]
+
+    principals {
+      type        = "AWS"
+      identifiers = ["*"]
+    }
+
+    condition {
+      test     = "StringLike"
+      variable = "aws:PrincipalArn"
+      values = [
+        "arn:aws:iam::${id}:role/aws-reserved/sso.amazonaws.com/eu-west-2/AWSReservedSSO_AdministratorAccess_*",
+        "arn:aws:iam::${id}:role/github-oidc-${var.application}-repo-role",
+        "arn:aws:iam::${id}:role/${var.application}-${var.codebase}-codebase-image-build"
+      ]
+    }
+  }
+
   statement {
     sid    = "PreventRepoDelete"
     effect = "Deny"