diff --git a/docker/create_images.sh b/docker/create_images.sh
index fb219060..d667bf71 100755
--- a/docker/create_images.sh
+++ b/docker/create_images.sh
@@ -33,9 +33,13 @@ pushd openvidu-getaroom/docker || exit 1
 popd || exit 1
 
 # Build openvidu-classroom-demo
-pushd ../classroom-demo/docker || exit 1
-./create_image.sh "openvidu/openvidu-classroom-demo:$1"
-popd || exit 1
+if [ -d "../classroom-demo/docker" ]; then
+    pushd ../classroom-demo/docker || exit 1
+    ./create_image.sh "openvidu/openvidu-classroom-demo:$1"
+    popd || exit 1
+else
+    echo "classroom-demo not found. Skipping..."
+fi
 
 # =======================
 # Building Basic application servers
diff --git a/docker/push_images.sh b/docker/push_images.sh
index 3db33dbf..9a93a011 100755
--- a/docker/push_images.sh
+++ b/docker/push_images.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eu -o pipefail
 
 if [ $# -eq 0 ]; then
     echo "No version argument provided. Usage: \"./push_images.sh 2.17.0\""
@@ -9,7 +10,12 @@ fi
 docker push openvidu/openvidu-js-demo:"$1"
 docker push openvidu/openvidu-js-screen-share-demo:"$1"
 docker push openvidu/openvidu-roles-java-demo:"$1"
-docker push openvidu/openvidu-classroom-demo:"$1"
 docker push openvidu/openvidu-getaroom-demo:"$1"
 docker push openvidu/openvidu-basic-node-demo:"$1"
 docker push openvidu/openvidu-demo-proxy:"$1"
+
+if [ "$(docker images | grep openvidu/openvidu-classroom-demo)" ]; then
+    docker push openvidu/openvidu-classroom-demo:"$1"
+else
+    echo "classroom-demo container not built. Skipping"
+fi