diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7cdd0418..dfb35d15 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -85,7 +85,6 @@ jobs:
           - openssl-qat-engine
           - sgx-sdk-demo
           - sgx-aesmd-demo
-          - ubuntu-demo-opencl
           - ubuntu-demo-openvino
         builder: [buildah, docker]
     steps:
diff --git a/demo/intelgpu-job.yaml b/demo/intelgpu-job.yaml
index 2d74d2f8..ce873742 100644
--- a/demo/intelgpu-job.yaml
+++ b/demo/intelgpu-job.yaml
@@ -14,9 +14,9 @@ spec:
       containers:
         -
           name: intelgpu-demo-job-1
-          image: intel/ubuntu-demo-opencl:devel
+          image: intelopencl/intel-opencl:ubuntu-20.10-ppa
           imagePullPolicy: IfNotPresent
-          command: [ "/run-opencl-example.sh", "/root/6-1/fft" ]
+          command: [ "clinfo" ]
           resources:
             limits:
               gpu.intel.com/i915: 1
diff --git a/demo/ubuntu-demo-opencl/Dockerfile b/demo/ubuntu-demo-opencl/Dockerfile
deleted file mode 100644
index 1017619b..00000000
--- a/demo/ubuntu-demo-opencl/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM ubuntu:bionic
-
-COPY run-opencl-example.sh /
-COPY fft.patch /
-COPY expected.pgm /
-
-RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y locales git ocl-icd-opencl-dev build-essential \
-                       clinfo jq uprightdiff wget unzip && \
-    sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
-    echo 'LANG="en_US.UTF-8"'>/etc/default/locale && \
-    dpkg-reconfigure --frontend=noninteractive locales && \
-    update-locale LANG=en_US.UTF-8 && \
-    cd /root && wget https://github.com/intel/compute-runtime/releases/download/18.26.10987/intel-opencl_18.26.10987_amd64.deb && \
-    dpkg -i /root/*.deb && \
-    ldconfig && \
-    wget https://us.fixstars.com/dl/opencl/samples.zip && \
-    unzip samples.zip && \
-    cd 6-1/fft && \
-    patch -p0 < /fft.patch && \
-    gcc -g fft.cpp -o fft -lOpenCL -lm
-
-ENV LANG en_US.UTF-8
diff --git a/demo/ubuntu-demo-opencl/expected.pgm b/demo/ubuntu-demo-opencl/expected.pgm
deleted file mode 100644
index 326ed4d0..00000000
Binary files a/demo/ubuntu-demo-opencl/expected.pgm and /dev/null differ
diff --git a/demo/ubuntu-demo-opencl/fft.patch b/demo/ubuntu-demo-opencl/fft.patch
deleted file mode 100644
index 26f9400a..00000000
--- a/demo/ubuntu-demo-opencl/fft.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- /root/copy/6-1/fft/fft.cpp	2010-03-30 18:00:34.000000000 +0000
-+++ fft.cpp	2018-07-05 11:57:54.888088750 +0000
-@@ -32,14 +32,14 @@
-         case 1:
-             gws[0] = x;
-             gws[1] = 1;
--            lws[0] = 1;
--            lws[1] = 1;
-+            lws[0] = 16;
-+            lws[1] = 16;
-             break;
-         default:
-             gws[0] = x;
-             gws[1] = y;
--            lws[0] = 1;
--            lws[1] = 1;
-+            lws[0] = 16;
-+            lws[1] = 16;
-             break;
-     }
- 
diff --git a/demo/ubuntu-demo-opencl/run-opencl-example.sh b/demo/ubuntu-demo-opencl/run-opencl-example.sh
deleted file mode 100755
index d3730653..00000000
--- a/demo/ubuntu-demo-opencl/run-opencl-example.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh -xe
-
-WORK_DIR=$1
-
-cd $WORK_DIR
-
-./fft
-
-uprightdiff --format json output.pgm /expected.pgm diff.pgm > diff.json
-
-MODIFIED_AREA=`cat diff.json | jq '.modifiedArea'`
-
-if [ $MODIFIED_AREA -gt 10 ]; then
-    echo "The image difference with expected result is too big: ${MODIFIED_AREA} pixels"
-    exit 255
-fi
-echo "Success"