diff --git a/ci-scripts/commons.sh b/ci-scripts/commons.sh
index 94b8514a..758be205 100755
--- a/ci-scripts/commons.sh
+++ b/ci-scripts/commons.sh
@@ -93,6 +93,11 @@ if [[ "${CLEAN_ENVIRONMENT}" == true || "${EXECUTE_ALL}" == true ]]; then
     # Clean /opt/openvidu contents
     rm -rf /opt/openvidu/*
 
+    # Recreate working dir just in case it was placed under /opt/openvidu
+    if [[ -n "${GITHUB_ACTIONS_WORKING_DIR:-}" ]]; then
+        mkdir -p "${GITHUB_ACTIONS_WORKING_DIR}"
+    fi
+
 fi
 
 # -------------