diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index ad0b27c4894..5d44a025a2f 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -10,9 +10,8 @@ VARS=(
     CI_COMMIT_REF_NAME
     CI_COMMIT_TITLE
     CI_JOB_ID
-    S3_JWT_FILE
-    CI_JOB_STARTED_AT
     CI_JOB_NAME
+    CI_JOB_STARTED_AT
     CI_JOB_URL
     CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
     CI_MERGE_REQUEST_TITLE
@@ -74,6 +73,7 @@ VARS=(
     LD_LIBRARY_PATH
     LIBGL_ALWAYS_SOFTWARE
     LP_NUM_THREADS
+    LVP_POISON_MEMORY
     MESA_BASE_TAG
     MESA_BUILD_PATH
     MESA_DEBUG
@@ -88,12 +88,10 @@ VARS=(
     MESA_TEMPLATES_COMMIT
     MESA_VK_ABORT_ON_DEVICE_LOSS
     MESA_VK_IGNORE_CONFORMANCE_WARNING
-    S3_HOST
-    S3_RESULTS_UPLOAD
     NIR_DEBUG
+    PANVK_DEBUG
     PAN_I_WANT_A_BROKEN_VULKAN_DRIVER
     PAN_MESA_DEBUG
-    PANVK_DEBUG
     PIGLIT_FRACTION
     PIGLIT_NO_WINDOW
     PIGLIT_OPTIONS
@@ -114,6 +112,9 @@ VARS=(
     RADEON_DEBUG
     RADV_DEBUG
     RADV_PERFTEST
+    S3_HOST
+    S3_JWT_FILE
+    S3_RESULTS_UPLOAD
     SKQP_ASSETS_DIR
     SKQP_BACKENDS
     STORAGE_FORK_HOST_PATH
@@ -122,11 +123,10 @@ VARS=(
     USE_ANGLE
     VIRGL_HOST_API
     VIRGL_RENDER_SERVER
-    WAFFLE_PLATFORM
     VK_DRIVER
-    ZINK_DESCRIPTORS
+    WAFFLE_PLATFORM
     ZINK_DEBUG
-    LVP_POISON_MEMORY
+    ZINK_DESCRIPTORS
 
     # Dead code within Mesa CI, but required by virglrender CI
     # (because they include our files in their CI)