diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c3d51014..ca4263e8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -114,6 +114,7 @@ jobs:
           # Demo images
           - crypto-perf
           - dsa-accel-config-demo
+          - intel-opencl-icd
           - opae-nlb-demo
           - openssl-qat-engine
           - sgx-sdk-demo
diff --git a/cmd/gpu_plugin/README.md b/cmd/gpu_plugin/README.md
index 316b805a..ebaff423 100644
--- a/cmd/gpu_plugin/README.md
+++ b/cmd/gpu_plugin/README.md
@@ -212,6 +212,8 @@ master
 ### Testing the plugin
 
 We can test the plugin is working by deploying an OpenCL image and running `clinfo`.
+The sample OpenCL image can be built using `make intel-opencl-icd` and must be made
+available in the cluster.
 
 1. Create a job:
 
@@ -220,7 +222,7 @@ We can test the plugin is working by deploying an OpenCL image and running `clin
     job.batch/intelgpu-demo-job created
     ```
 
-1. Review the job's logs:
+2. Review the job's logs:
 
     ```bash
     $ kubectl get pods | fgrep intelgpu
diff --git a/demo/intel-opencl-icd/Dockerfile b/demo/intel-opencl-icd/Dockerfile
new file mode 100644
index 00000000..5c05bbcd
--- /dev/null
+++ b/demo/intel-opencl-icd/Dockerfile
@@ -0,0 +1,15 @@
+FROM ubuntu:20.04
+
+ARG APT="env DEBIAN_FRONTEND=noninteractive apt"
+
+RUN ${APT} update && ${APT} install -y curl gpg-agent \
+    && echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu focal main' | \
+       tee -a /etc/apt/sources.list.d/intel.list \
+    && curl -s https://repositories.intel.com/graphics/intel-graphics.key | \
+       gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg \
+    && ${APT} update \
+    && ${APT} install -y --no-install-recommends \
+       intel-opencl-icd \
+       clinfo \
+    && ${APT} remove -y curl gpg-agent \
+    && ${APT} autoremove -y
diff --git a/demo/intelgpu-job.yaml b/demo/intelgpu-job.yaml
index ce873742..14c9da35 100644
--- a/demo/intelgpu-job.yaml
+++ b/demo/intelgpu-job.yaml
@@ -14,7 +14,7 @@ spec:
       containers:
         -
           name: intelgpu-demo-job-1
-          image: intelopencl/intel-opencl:ubuntu-20.10-ppa
+          image: intel/intel-opencl-icd:devel
           imagePullPolicy: IfNotPresent
           command: [ "clinfo" ]
           resources: