diff --git a/demos/cluster_serving/install-dependencies.sh b/demos/cluster_serving/install-dependencies.sh
index 3bd00b21..0dacfe62 100755
--- a/demos/cluster_serving/install-dependencies.sh
+++ b/demos/cluster_serving/install-dependencies.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 
 apt-get update
-apt-get install -y openjdk-11-jdk
+apt-get install -y openjdk-11-jre
 apt-get install -y netcat
 
+#The openjdk has a broken symlink, remove it as a workaround
+rm /usr/lib/jvm/java-11-openjdk-amd64/lib/security/blacklisted.certs
+
 # Redis
 wget http://download.redis.io/releases/redis-${REDIS_VERSION}.tar.gz && \
 tar -zxvf redis-${REDIS_VERSION}.tar.gz
diff --git a/demos/flink/download_flink.sh b/demos/flink/download_flink.sh
index 3086e945..7a9c9a57 100755
--- a/demos/flink/download_flink.sh
+++ b/demos/flink/download_flink.sh
@@ -1,4 +1,7 @@
 apt-get update
-apt-get install -y openjdk-11-jdk
+apt-get install -y openjdk-11-jre
+#The openjdk has a broken symlink, remove it as a workaround
+rm /usr/lib/jvm/java-11-openjdk-amd64/lib/security/blacklisted.certs
+
 wget https://archive.apache.org/dist/flink/flink-1.10.1/flink-1.10.1-bin-scala_2.11.tgz
 tar -xvzf flink-1.10.1-bin-scala_2.11.tgz