diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
index 4133f81ce..24dec5785 100644
--- a/.github/workflows/prod.yml
+++ b/.github/workflows/prod.yml
@@ -11,8 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - uses: superfly/flyctl-actions@1.4
-        with:
-          args: "-c deploy/fly/prod.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}"
+      - uses: superfly/flyctl-actions/setup-flyctl@1.4
+      - run: "flyctl -c deploy/fly/prod.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}"
         env:
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
\ No newline at end of file
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 389906bae..c11ec34fe 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -11,6 +11,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: superfly/flyctl-actions@1.4
-        with:
-          args: "-c deploy/fly/staging.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}"
+      - uses: superfly/flyctl-actions/setup-flyctl@1.4
+      - run: "flyctl -c deploy/fly/staging.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}"
diff --git a/.github/workflows/staging_supabench.yml b/.github/workflows/staging_supabench.yml
index cc3a6cca5..502a05489 100644
--- a/.github/workflows/staging_supabench.yml
+++ b/.github/workflows/staging_supabench.yml
@@ -11,16 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: superfly/flyctl-actions@1.4
-        with:
-          args: "-c deploy/fly/qa.toml scale count 1"
-      - uses: superfly/flyctl-actions@1.4
-        with:
-          args: "-c deploy/fly/qa.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}"
-      - uses: superfly/flyctl-actions@1.4
-        if: always()
-        with:
-          args: "-c deploy/fly/qa.toml scale count 0"
+      - uses: superfly/flyctl-actions/setup-flyctl@1.4
+      - run: "flyctl -c deploy/fly/qa.toml scale count 1"
+      - run: "flyctl -c deploy/fly/qa.toml deploy --build-arg SLOT_NAME_SUFFIX=${GITHUB_SHA::7}"
+      - run: "flyctl -c deploy/fly/qa.toml scale count 0"
       - name: Get PR into variable
         run: echo "PR_NUM=$(git show -s --format=%s | grep -Po '(?<=#)[0-9]*')" >> $GITHUB_ENV
       - name: Start Supabench