diff --git a/terraform/rustc-ci/impl/artifacts.tf b/terraform/rustc-ci/impl/artifacts.tf
index 2724cdc79..b9f9342d5 100644
--- a/terraform/rustc-ci/impl/artifacts.tf
+++ b/terraform/rustc-ci/impl/artifacts.tf
@@ -150,8 +150,12 @@ resource "aws_s3_bucket_inventory" "artifacts" {
   }
 }
 
-resource "aws_iam_role" "try_builds" {
-  name = "${var.iam_prefix}--try-role"
+data "aws_iam_openid_connect_provider" "gha" {
+  url = "https://token.actions.githubusercontent.com"
+}
+
+resource "aws_iam_role" "oidc" {
+  name = "${var.iam_prefix}--role"
 
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
@@ -160,11 +164,29 @@ resource "aws_iam_role" "try_builds" {
         Effect = "Allow"
         Action = "sts:AssumeRoleWithWebIdentity"
         Principal = {
-          Federated = "arn:aws:iam::890664054962:oidc-provider/token.actions.githubusercontent.com"
+          Federated = "cognito-identity.amazonaws.com"
+        }
+        Condition = {
+          StringEquals = {
+            "cognito-identity.amazonaws.com:aud" = "${aws_cognito_identity_pool.main.id}"
+            // This forces the caller to set the session name according to the caller's run & sha
+            "sts:RoleSessionName"       = "$${aws:RequestTag/run_id}@$${aws:RequestTag/sha}"
+            "aws:RequestTag/repository" = "${var.source_repo}"
+            // For now only allow new bors & try builds
+            "aws:RequestTag/ref"        = "refs/heads/automation/bors/try"
+            "aws:RequestTag/event_name" = "push"
+          }
+        }
+      },
+      {
+        Effect = "Allow"
+        Action = "sts:TagSession"
+        Principal = {
+          Federated = "cognito-identity.amazonaws.com"
         }
         Condition = {
           StringEquals = {
-            "token.actions.githubusercontent.com:sub" = "repo:${var.repo}:ref:refs/heads/automation/bors/try"
+            "cognito-identity.amazonaws.com:aud" = "${aws_cognito_identity_pool.main.id}"
           }
         }
       }
@@ -180,10 +202,8 @@ resource "aws_iam_role" "try_builds" {
           Sid    = "ArtifactsBucketWrite"
           Effect = "Allow"
           Resource = [
-            "${aws_s3_bucket.artifacts.arn}/rustc-builds-try",
-            "${aws_s3_bucket.artifacts.arn}/rustc-builds-try/*",
-            "${aws_s3_bucket.artifacts.arn}/rustc-builds-try-alt",
-            "${aws_s3_bucket.artifacts.arn}/rustc-builds-try-alt/*",
+            "${aws_s3_bucket.artifacts.arn}/rustc-builds/$${aws:PrincipalTag/sha}/*",
+            "${aws_s3_bucket.artifacts.arn}/rustc-builds-alt/$${aws:PrincipalTag/sha}/*",
           ]
           Action = [
             "s3:GetObject",
diff --git a/terraform/rustc-ci/impl/cognito.tf b/terraform/rustc-ci/impl/cognito.tf
new file mode 100644
index 000000000..61e64d616
--- /dev/null
+++ b/terraform/rustc-ci/impl/cognito.tf
@@ -0,0 +1,23 @@
+resource "aws_cognito_identity_pool" "main" {
+  identity_pool_name               = "${var.iam_prefix}--rustc-ci"
+  allow_classic_flow               = true
+  allow_unauthenticated_identities = false
+  openid_connect_provider_arns     = ["${data.aws_iam_openid_connect_provider.gha.arn}"]
+}
+
+resource "aws_cognito_identity_pool_provider_principal_tag" "gha_mapper" {
+  identity_pool_id       = aws_cognito_identity_pool.main.id
+  identity_provider_name = data.aws_iam_openid_connect_provider.gha.arn
+  use_defaults           = false
+
+  // This maps the claims on the left (from GHA, see https://token.actions.githubusercontent.com/.well-known/openid-configuration)
+  // to "RequestTag"'s on the right. These are then matchable in the AssumeRole policy.
+  principal_tags = {
+    actor        = "actor"
+    workflow_sha = "sha"
+    run_id       = "run_id"
+    event        = "event_name"
+    ref          = "ref"
+    repository   = "repository"
+  }
+}