diff --git a/.github/actions/raw-terraform/action.yml b/.github/actions/raw-terraform/action.yml
index 67156337b..42465db32 100644
--- a/.github/actions/raw-terraform/action.yml
+++ b/.github/actions/raw-terraform/action.yml
@@ -31,6 +31,7 @@ runs:
       shell: bash
       run: |
         git clone --depth=1 https://github.com/tfutils/tfenv.git ~/.tfenv
+        echo "PATH=$HOME/.tfenv/bin:$PATH" >> $GITHUB_ENV
 
     # Setup Terraform Comment
     - uses: shmokmt/actions-setup-tfcmt@v2
@@ -46,9 +47,6 @@ runs:
         restore-keys: |
           ${{ runner.os }}-tfenv-
 
-  # TODO: These need to request AWS credentials to run terraform
-  # It may be best to not do AWS credentials here and do it in the calling workflow.. TBD
-
     - name: Copy Terraform Vars
       shell: bash
       run: |
diff --git a/.github/workflows/reuse-infrastructure.yml b/.github/workflows/reuse-infrastructure.yml
index ae0b3b896..e36bc958b 100644
--- a/.github/workflows/reuse-infrastructure.yml
+++ b/.github/workflows/reuse-infrastructure.yml
@@ -60,7 +60,8 @@ jobs:
           with:
             stack-output-path: ${{inputs['stack-output-path']}}
             scope: ${{inputs['scope']}}
-            environment: production
+            # TODO: Change this to production when ready
+            environment: development #production
             behavior: plan
             github-token: ${{ secrets.GITHUB_TOKEN }}
             pagerduty-token: ${{ secrets.PAGERDUTY_TOKEN }}
diff --git a/.github/workflows/user-list-search.yml b/.github/workflows/user-list-search.yml
index 544ac9600..976f16eaa 100644
--- a/.github/workflows/user-list-search.yml
+++ b/.github/workflows/user-list-search.yml
@@ -40,6 +40,7 @@ jobs:
     with:
       raw-terraform: true
       stack-output-path: infrastructure/user-list-search
+      scope: user-list-search
     secrets: inherit
 
   api:
diff --git a/README.md b/README.md
index 097c654bb..d342a4af2 100644
--- a/README.md
+++ b/README.md
@@ -127,3 +127,27 @@ Learn more about the power of Turborepo:
 - [Filtering](https://turbo.build/repo/docs/core-concepts/monorepos/filtering)
 - [Configuration Options](https://turbo.build/repo/docs/reference/configuration)
 - [CLI Usage](https://turbo.build/repo/docs/reference/command-line-reference)
+
+## Service CI Status
+
+[![Account Data Deleter](https://github.com/Pocket/pocket-monorepo/actions/workflows/account-data-deleter.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/account-data-deleter.yml)
+[![Account Delete Monitor](https://github.com/Pocket/pocket-monorepo/actions/workflows/account-delete-monitor.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/account-delete-monitor.yml)
+[![Annotations API](https://github.com/Pocket/pocket-monorepo/actions/workflows/annotations-api.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/annotations-api.yml)
+[![Braze](https://github.com/Pocket/pocket-monorepo/actions/workflows/braze.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/braze.yml)
+[![Client API](https://github.com/Pocket/pocket-monorepo/actions/workflows/client-api.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/client-api.yml)
+[![Feature Flags](https://github.com/Pocket/pocket-monorepo/actions/workflows/feature-flags.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/feature-flags.yml)
+[![FxA Webhook Proxy](https://github.com/Pocket/pocket-monorepo/actions/workflows/fxa-webhook-proxy.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/fxa-webhook-proxy.yml)
+[![Image API](https://github.com/Pocket/pocket-monorepo/actions/workflows/image-api.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/image-api.yml)
+[![Instant Sync Events](https://github.com/Pocket/pocket-monorepo/actions/workflows/instant-sync-events.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/instant-sync-events.yml)
+[![List API](https://github.com/Pocket/pocket-monorepo/actions/workflows/list-api.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/list-api.yml)
+[![Parser GraphQL Wrapper](https://github.com/Pocket/pocket-monorepo/actions/workflows/parser-graphql-wrapper.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/parser-graphql-wrapper.yml)
+[![Pocket Event Bridge](https://github.com/Pocket/pocket-monorepo/actions/workflows/pocket-event-bridge.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/pocket-event-bridge.yml)
+[![Push Server](https://github.com/Pocket/pocket-monorepo/actions/workflows/push-server.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/push-server.yml)
+[![Sendgrid Data](https://github.com/Pocket/pocket-monorepo/actions/workflows/sendgrid-data.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/sendgrid-data.yml)
+[![Shareable Lists API](https://github.com/Pocket/pocket-monorepo/actions/workflows/shareable-lists-api.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/shareable-lists-api.yml)
+[![Shared Snowplow Consumer](https://github.com/Pocket/pocket-monorepo/actions/workflows/shared-snowplow-consumer.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/shared-snowplow-consumer.yml)
+[![Shares API](https://github.com/Pocket/pocket-monorepo/actions/workflows/shares-api.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/shares-api.yml)
+[![Transactional Emails](https://github.com/Pocket/pocket-monorepo/actions/workflows/transactional-emails.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/transactional-emails.yml)
+[![User API](https://github.com/Pocket/pocket-monorepo/actions/workflows/user-api.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/user-api.yml)
+[![User List Search](https://github.com/Pocket/pocket-monorepo/actions/workflows/user-list-search.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/user-list-search.yml)
+[![V3 Proxy API](https://github.com/Pocket/pocket-monorepo/actions/workflows/v3-proxy-api.yml/badge.svg)](https://github.com/Pocket/pocket-monorepo/actions/workflows/v3-proxy-api.yml)
diff --git a/infrastructure/user-list-search/apollo_ecs.tf b/infrastructure/user-list-search/apollo_ecs.tf
index d12af44a2..e47c34c32 100644
--- a/infrastructure/user-list-search/apollo_ecs.tf
+++ b/infrastructure/user-list-search/apollo_ecs.tf
@@ -145,15 +145,9 @@ output "ecs-serviceName" {
   description = "ECS Service Name"
   value       = aws_ecs_service.apollo.name
 }
-
-output "ecs-task-arn" {
-  description = "ECS Task Arn"
-  value       = aws_ecs_task_definition.apollo.arn
-}
-
 output "ecs-clusterName" {
   description = "ECS Cluster Name"
-  value       = aws_ecs_service.apollo.cluster.name
+  value       = aws_ecs_cluster.ecs_cluster.name
 }
 
 output "ecs-application-url" {