diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 744c2c162dcbcba5a596f3372d7323deaee7ff38..efc8bdde281829924e1db15c09786d84f86b3e69 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -100,11 +100,7 @@ jobs:
                 . ./ci-support-v0
                 build_py_project_in_conda_env
 
-                # https://github.com/ispc/ispc/issues/2240
-                # curl -L "https://ci.appveyor.com/api/projects/ispc/ispc/artifacts/build%2Fispc-trunk-linux.tar.gz?job=Environment%3A%20APPVEYOR_BUILD_WORKER_IMAGE%3DUbuntu1604%2C%20LLVM_VERSION%3Dlatest" | tar xfz -
-                # export PATH="$(pwd)/ispc-trunk-linux/bin:$PATH"
-                curl -L https://github.com/ispc/ispc/releases/download/v1.17.0/ispc-v1.17.0-linux.tar.gz  | tar xfz -
-                export PATH="$(pwd)/ispc-v1.17.0-linux/bin:$PATH"
+                install_ispc
 
                 export PYOPENCL_TEST=portable:pthread
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3945734eb1d7e5063f0471b9846ba702121f3c32..32d1b886ba6153799080f024740b2e5fbb382c73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -114,12 +114,12 @@ Pytest POCL Examples:
     export PYOPENCL_TEST=portable:pthread
     export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib ipykernel nbconvert"
 
-    curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
-    . ./ci-support.sh
+    curl -L -O -k https://tiker.net/ci-support-v0
+    . ./ci-support-v0
+
     build_py_project_in_venv
 
-    curl -L "https://ci.appveyor.com/api/projects/ispc/ispc/artifacts/build%2Fispc-trunk-linux.tar.gz?job=Environment%3A%20APPVEYOR_BUILD_WORKER_IMAGE%3DUbuntu1604%2C%20LLVM_VERSION%3Dlatest" | tar xfz -
-    export PATH="$(pwd)/ispc-trunk-linux/bin:$PATH"
+    install_ispc
 
     . ./build-py-project-and-run-examples.sh
     run_py_examples