diff --git a/.github/workflows/deploy.test.yml b/.github/workflows/deploy.test.yml
index ab2eea90..413a7be4 100644
--- a/.github/workflows/deploy.test.yml
+++ b/.github/workflows/deploy.test.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: self-hosted
+    runs-on: [self-hosted, test-deploy]
     steps:
       - uses: actions/checkout@v3
 
@@ -35,4 +35,4 @@ jobs:
           echo "${{ secrets.APPFLOWY_CLOUD_KEY }}" | base64 --decode > ./nginx/ssl/private_key.key
 
       - name: Deploy docker-compose
-        run: sudo docker-compose up -d --build --force-recreate
+        run: sudo docker compose up -d --build --force-recreate
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d9c29487..11ba45e0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -36,10 +36,9 @@ jobs:
 
       - name: Run Docker-Compose
         run: |
-          docker-compose up -d
+          docker compose up -d
 
       - name: Run tests
         run: |
           cargo install sqlx-cli --version=${{ env.SQLX_VERSION }} --features ${{ env.SQLX_FEATURES }} --no-default-features --locked
-          cargo sqlx prepare --check --workspace
           RUST_LOG=debug cargo test
diff --git a/README.md b/README.md
index a4a212cc..60f4bbb5 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ You'll need to install:
 
 ### Run the dependency servers
 ```bash
-docker-compose --file docker-compose-dev.yml up -d
+docker compose --file docker-compose-dev.yml up -d
 ```
 
 ### Install sqlx-cli
diff --git a/build/run_local_server.sh b/build/run_local_server.sh
index ac8e3aff..c6b8afce 100755
--- a/build/run_local_server.sh
+++ b/build/run_local_server.sh
@@ -10,7 +10,7 @@ DB_PORT="${POSTGRES_PORT:=5433}"
 DB_HOST="${POSTGRES_HOST:=localhost}"
 
 # Stop and remove any existing containers to avoid conflicts
-docker-compose --file ./docker-compose-dev.yml down
+docker compose --file ./docker-compose-dev.yml down
 
 # Start the Docker Compose setup
 export GOTRUE_MAILER_AUTOCONFIRM=true
@@ -18,7 +18,7 @@ export GOTRUE_MAILER_AUTOCONFIRM=true
 # Enable Google OAuth when running locally
 export GOTRUE_EXTERNAL_GOOGLE_ENABLED=true
 
-docker-compose --file ./docker-compose-dev.yml up -d --build
+docker compose --file ./docker-compose-dev.yml up -d --build
 
 # Keep pinging Postgres until it's ready to accept commands
 ATTEMPTS=0
@@ -58,4 +58,4 @@ RUST_LOG=trace cargo run &
 
 # revert to require signup email verification
 export GOTRUE_MAILER_AUTOCONFIRM=false
-docker-compose --file ./docker-compose-dev.yml up -d
+docker compose --file ./docker-compose-dev.yml up -d
diff --git a/docker/postgres.Dockerfile b/docker/postgres.Dockerfile
index 6aed7ea9..8d469eb7 100644
--- a/docker/postgres.Dockerfile
+++ b/docker/postgres.Dockerfile
@@ -1,12 +1,27 @@
 FROM postgres:latest
 
-# Install dependencies required for pgjwt
+# Install dependencies required for pgjwt and locales
 RUN apt-get update && \
-    apt-get install -y build-essential postgresql-server-dev-all git
+    apt-get install -y \
+        build-essential \
+        postgresql-server-dev-all \
+        git \
+        locales && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+# Setup locale
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
+    locale-gen en_US.UTF-8 && \
+    update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
 
 # Clone and build pgjwt
 RUN rm -rf pgjwt && \
     git clone https://github.com/michelp/pgjwt.git && \
     cd pgjwt && \
     make && \
-    make install
\ No newline at end of file
+    make install