diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 34e59c5..3db0424 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -49,6 +49,21 @@ jobs:
           --health-timeout 5s
           --health-retries 5
 
+      localstack:
+        image: localstack/localstack:latest
+        env:
+          SERVICES: s3
+          AWS_ACCESS_KEY_ID: GK31c5f2dab2a46c2a3b2653f3
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.GARAGE_SECRET }}
+          AWS_DEFAULT_REGION: us-east-1
+        options: >-
+          --health-cmd "curl -f http://localhost:4566/_localstack/health || exit 1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 3900:3900
+
     steps:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -67,16 +82,6 @@ jobs:
           docker ps -a
           echo "Docker environment check complete."
 
-      - name: Setup Garage S3 Server
-        uses: lowlydba/setup-garage@v1.0.0
-        with:
-          garage-version: 'v2.3.0'
-          bucket: 'soaricarus-ci-bucket'
-          set-aws-env: 'true'
-          # container-name: 'amaze'
-          access-key-id: GK31c5f2dab2a46c2a3b2653f3
-          secret-access-key: ${{ secrets.GARAGE_SECRET }}
-          region: us-test-1
       - name: Run tests
         env:
           # Define DATABASE_URL for tests to use