diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yaml
similarity index 100%
rename from .github/workflows/ci.yml
rename to .github/workflows/ci.yaml
diff --git a/.github/workflows/fly-review.yaml.yml b/.github/workflows/fly-review.yaml.yml
new file mode 100644
index 00000000..074e2f22
--- /dev/null
+++ b/.github/workflows/fly-review.yaml.yml
@@ -0,0 +1,28 @@
+name: Fly Deploy Review
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize, closed]
+
+env:
+  FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+  FLY_ORG: personal
+
+jobs:
+  review_app:
+    name: Deploy review app
+    runs-on: ubuntu-latest
+    outputs:
+      url: ${{ steps.deploy.outputs.url }}
+    concurrency:
+      group: pr-${{ github.event.number }}
+    environment:
+      name: review
+      url: ${{ steps.deploy.outputs.url }}
+
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+      - id: deploy
+        uses: superfly/fly-pr-review-apps@1.5.0
+        with:
+          name: simon-dev-pr-${{ github.event.number }}
diff --git a/.github/workflows/fly.yaml b/.github/workflows/fly.yaml
new file mode 100644
index 00000000..c20da01b
--- /dev/null
+++ b/.github/workflows/fly.yaml
@@ -0,0 +1,19 @@
+name: Fly Deploy
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    name: Deploy app
+    runs-on: ubuntu-latest
+    concurrency: deploy-group
+
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - run: flyctl deploy --remote-only
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}