diff --git a/.github/scripts/patches/compute-versions.py b/.github/scripts/patches/compute-versions.py
index e569dabe2ed..c2fa49a90b2 100644
--- a/.github/scripts/patches/compute-versions.py
+++ b/.github/scripts/patches/compute-versions.py
@@ -20,18 +20,23 @@
 versions = []
 for obj in data['packages'] + data_testing['packages']:
     if (
-        obj['version_details']['major'] == version
+        obj['basename'] in {'gel-server', 'edgedb-server'}
+        and obj['version_details']['major'] == version
         and (
             not obj['version_details']['prerelease']
             or obj['version_details']['prerelease'][0]['phase'] in ('beta', 'rc')
         )
     ):
-        versions.append((obj['version'], base + obj['installrefs'][0]['ref']))
+        versions.append((
+            obj['version'],
+            obj['basename'],
+            base + obj['installrefs'][0]['ref'],
+        ))
 
 matrix = {
     "include": [
-        {"edgedb-version": v, "edgedb-url": url, "make-dbs": mk}
-        for v, url in versions
+        {"edgedb-version": v, "edgedb-url": url, "edgedb-basename": base, "make-dbs": mk}
+        for v, base, url in versions
         for mk in [True, False]
     ]
 }
diff --git a/.github/scripts/patches/create-databases.py b/.github/scripts/patches/create-databases.py
index 3bb79029e3f..4f371c256ea 100644
--- a/.github/scripts/patches/create-databases.py
+++ b/.github/scripts/patches/create-databases.py
@@ -1,12 +1,11 @@
 # Create databases on the older edgedb version
 
 import edgedb
-import os
 import subprocess
+import sys
 
-version = os.getenv('EDGEDB_VERSION')
 cmd = [
-    f'edgedb-server-{version}/bin/edgedb-server', '-D' 'test-dir',
+    sys.argv[1], '-D' 'test-dir',
     '--testmode', '--security', 'insecure_dev_mode', '--port', '10000',
 ]
 proc = subprocess.Popen(cmd)
diff --git a/.github/workflows.src/tests-patches.tpl.yml b/.github/workflows.src/tests-patches.tpl.yml
index 42100081183..864b55d7d13 100644
--- a/.github/workflows.src/tests-patches.tpl.yml
+++ b/.github/workflows.src/tests-patches.tpl.yml
@@ -47,19 +47,14 @@ jobs:
     # Run the test
 
     - name: Download an earlier database version and set up a instance
-      env:
-        EDGEDB_VERSION: ${{ matrix.edgedb-version }}
-        EDGEDB_URL: ${{ matrix.edgedb-url }}
       run: |
-        wget -q "$EDGEDB_URL"
-        tar xzf edgedb-server-$EDGEDB_VERSION.tar.gz
-        edgedb-server-$EDGEDB_VERSION/bin/edgedb-server -D test-dir --bootstrap-only --testmode
+        wget -q "${{ matrix.edgedb-url }}"
+        tar xzf ${{ matrix.edgedb-basename }}-${{ matrix.edgedb-version }}.tar.gz
+        ${{ matrix.edgedb-basename }}-${{ matrix.edgedb-version }}/bin/edgedb-server -D test-dir --bootstrap-only --testmode
 
     - name: Create databases on the older version
-      env:
-        EDGEDB_VERSION: ${{ matrix.edgedb-version }}
       if: ${{ matrix.make-dbs }}
-      run: python3 .github/scripts/patches/create-databases.py
+      run: python3 .github/scripts/patches/create-databases.py ${{ matrix.edgedb-basename }}-${{ matrix.edgedb-version }}/bin/edgedb-server
 
     - name: Run tests with instance created on an older version
       run: |
diff --git a/.github/workflows/tests-patches.yml b/.github/workflows/tests-patches.yml
index 3c2ba15bcd7..60a8e5ecdb5 100644
--- a/.github/workflows/tests-patches.yml
+++ b/.github/workflows/tests-patches.yml
@@ -508,19 +508,14 @@ jobs:
     # Run the test
 
     - name: Download an earlier database version and set up a instance
-      env:
-        EDGEDB_VERSION: ${{ matrix.edgedb-version }}
-        EDGEDB_URL: ${{ matrix.edgedb-url }}
       run: |
-        wget -q "$EDGEDB_URL"
-        tar xzf edgedb-server-$EDGEDB_VERSION.tar.gz
-        edgedb-server-$EDGEDB_VERSION/bin/edgedb-server -D test-dir --bootstrap-only --testmode
+        wget -q "${{ matrix.edgedb-url }}"
+        tar xzf ${{ matrix.edgedb-basename }}-${{ matrix.edgedb-version }}.tar.gz
+        ${{ matrix.edgedb-basename }}-${{ matrix.edgedb-version }}/bin/edgedb-server -D test-dir --bootstrap-only --testmode
 
     - name: Create databases on the older version
-      env:
-        EDGEDB_VERSION: ${{ matrix.edgedb-version }}
       if: ${{ matrix.make-dbs }}
-      run: python3 .github/scripts/patches/create-databases.py
+      run: python3 .github/scripts/patches/create-databases.py ${{ matrix.edgedb-basename }}-${{ matrix.edgedb-version }}/bin/edgedb-server
 
     - name: Run tests with instance created on an older version
       run: |