diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27fcc5a6..3fb139d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,6 +6,13 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  # Force software rendering on CI, because
+  # we were getting a CI error on Ubuntu 24.04 as follows:
+  #   MESA: error: ZINK: vkCreateInstance failed (VK_ERROR_INCOMPATIBLE_DRIVER))
+  # For more information, see https://github.com/lgi-devs/lgi/pull/332
+  LIBGL_ALWAYS_SOFTWARE: 1
+
 jobs:
   build_puc:
     name: Test on PUC-Rio Lua
@@ -15,18 +22,19 @@ jobs:
       matrix:
         version: [5.1.5, 5.2.4, 5.3.6, 5.4.7]
 
+    env:
+      LUA_VERSION: ${{ matrix.version }}
+    
     steps:
+      - name: Install Lua dependencies
+        run: sudo apt install -y libreadline-dev
       - name: Build PUC-Rio Lua ${{ matrix.version }}
-        env:
-          LUA_VERSION: ${{ matrix.version }}
         run: |
           wget "https://www.lua.org/ftp/lua-${LUA_VERSION}.tar.gz"
           tar xzvf "lua-${LUA_VERSION}.tar.gz"
           cd "lua-${LUA_VERSION}"
-          make linux SYSLIBS="-Wl,-E -ldl -lreadline" SYSCFLAGS="-DLUA_USE_LINUX -ULUA_COMPAT_5_2 -DLUA_USE_APICHECK" CC='gcc -g'
+          make linux SYSLIBS="-Wl,-E -ldl -lreadline" SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_APICHECK" CC='gcc -g'
       - name: Install PUC-Rio Lua ${{ matrix.version }}
-        env:
-          LUA_VERSION: ${{ matrix.version }}
         run: |
           cd "lua-${LUA_VERSION}"
           sudo make install
@@ -46,7 +54,6 @@ jobs:
           xvfb-run -a sh -c 'LD_PRELOAD="${sanitizers}" make check'
       - name: Check that make install works
         env:
-          LUA_VERSION: ${{ matrix.version }}
           LSAN_OPTIONS: suppressions=${{ github.workspace }}/.github/lsan.supp
           UBSAN_OPTIONS: print_stacktrace=1:report_error_type=1:halt_on_error=1:suppressions=${{ github.workspace }}/.github/ubsan.supp
         run: |
diff --git a/.github/workflows/msvc-ci.yml b/.github/workflows/msvc-ci.yml
index e94072f6..0d5abe05 100644
--- a/.github/workflows/msvc-ci.yml
+++ b/.github/workflows/msvc-ci.yml
@@ -26,7 +26,7 @@ jobs:
     
     env:
       WINGTK_URL: https://github.com/wingtk/gvsbuild/releases/download/2024.10.0/GTK${{ matrix.gtk-major-version }}_Gvsbuild_2024.10.0_x64.zip
-      LUAINSTALLER_URL: https://github.com/luau-project/LuaInstaller/releases/download/v0.3.0.0/LuaInstaller.Console-v0.3.0.0-x64.zip
+      LUAINSTALLER_URL: https://github.com/luau-project/LuaInstaller/releases/download/v0.5.0.0/LuaInstaller.Console-v0.5.0.0-x64.zip
 
     steps: