diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index b9f2fc134..0a584a558 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -20,7 +20,7 @@ jobs:
         php-version:
           - "7.4"
         driver-version:
-          - "mongodb/mongo-php-driver@master"
+          - "stable"
 
     steps:
       - name: "Checkout"
@@ -42,8 +42,7 @@ jobs:
           restore-keys: ${{ steps.extcache.outputs.key }}
 
       - name: "Install PHP"
-        # Todo: switch to @v2 once a tag has been created
-        uses: "shivammathur/setup-php@develop"
+        uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
           extensions: "mongodb-${{ matrix.driver-version }}"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index dbde407ee..e0b88fe70 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,24 +26,24 @@ jobs:
         mongodb-version:
           - "4.4"
         driver-version:
-          - "mongodb/mongo-php-driver@master"
+          - "stable"
         topology:
           - "server"
         include:
           - os: "ubuntu-20.04"
             php-version: "8.0"
             mongodb-version: "5.0"
-            driver-version: "mongodb/mongo-php-driver@master"
+            driver-version: "stable"
             topology: "server"
           - os: "ubuntu-20.04"
             php-version: "8.0"
             mongodb-version: "4.4"
-            driver-version: "mongodb/mongo-php-driver@master"
+            driver-version: "stable"
             topology: "replica_set"
           - os: "ubuntu-20.04"
             php-version: "8.0"
             mongodb-version: "4.4"
-            driver-version: "mongodb/mongo-php-driver@master"
+            driver-version: "stable"
             topology: "sharded_cluster"
 
     steps:
@@ -74,8 +74,7 @@ jobs:
           restore-keys: ${{ steps.extcache.outputs.key }}
 
       - name: "Install PHP"
-        # Todo: switch to @v2 once a tag has been created
-        uses: "shivammathur/setup-php@develop"
+        uses: "shivammathur/setup-php@v2"
         with:
           php-version: "${{ matrix.php-version }}"
           tools: "pecl"