diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 9408988..a070320 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -91,6 +91,15 @@ jobs:
       - name: Login to Amazon ECR
         uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076
 
+      # ECR Public has a per-IP ratelist for unauthenticated users, which is often hit on
+      # GitHub actions due to jobs sharing IPs - this ensures we don't get rate limited
+      - name: Login to Amazon ECR Public
+        uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076
+        env:
+          AWS_REGION: us-east-1
+        with:
+          registry-type: public
+
       - name: Scan Images
         id: scan-images
         # https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-commands#example-of-a-multiline-string
diff --git a/.github/workflows/janitor.yaml b/.github/workflows/janitor.yaml
index 15c5031..445513b 100644
--- a/.github/workflows/janitor.yaml
+++ b/.github/workflows/janitor.yaml
@@ -23,7 +23,7 @@ permissions:
 jobs:
   janitor:
     # Don't run on forked repos
-    if: ${{ github.repository == 'aws/csi-components-test' }}
+    if: ${{ github.repository == 'aws/csi-components' }}
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go
diff --git a/.github/workflows/trivy-published.yaml b/.github/workflows/trivy-published.yaml
index 4f2b6c5..95a57ac 100644
--- a/.github/workflows/trivy-published.yaml
+++ b/.github/workflows/trivy-published.yaml
@@ -40,6 +40,8 @@ jobs:
       # GitHub actions due to jobs sharing IPs - this ensures we don't get rate limited
       - name: Login to Amazon ECR Public
         uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076
+        env:
+          AWS_REGION: us-east-1
         with:
           registry-type: public