diff --git a/Scripts/entrypoint.sh b/Scripts/entrypoint.sh
index f079dcc91151b43906043f7765d1b6dc16e837be..152bbbd379e983b54b8ab6d78a3cc74563189f54 100644
--- a/Scripts/entrypoint.sh
+++ b/Scripts/entrypoint.sh
@@ -64,7 +64,7 @@ function copy_artifacts() {
     echo -e "${YLW}=== Lib (${GRN}./build/lib${YLW}): ===${NC}"
     echo "`find /build/lib/ -type f | sed 's/\/build\/lib\///g'`"
     echo -e "${YLW}=== Python Wrapper (${GRN}./build/wrapper${YLW}): ===${NC}"
-    echo "`find /build/wrapper/ -type f | sed 's/\/build\/wrapper\///g'`"
+    echo "`find /build/wrapper/ -type f -not -path "/build/wrapper/docs/*" | sed 's/\/build\/wrapper\///g'`"
     echo_links
 }
 
@@ -152,7 +152,8 @@ if [ $# -gt 0 ]; then
         if [ $# -lt 1 ]; then
             # Clean everything if there isn't any provided component
             make_target $SBOX_LIB clean
-            make_target $SBOX_PYWR clean          
+            make_target $SBOX_PYWR clean
+            clean_python_doc          
         else
             for i in "$@"; do
                 # Clean every component passed in parameters
@@ -161,6 +162,8 @@ if [ $# -gt 0 ]; then
                         cd $app
                         make clean
                     done
+                elif [ $i = "docs" ]; then
+                    clean_python_doc
                 else
                     pth=$(get_target_path "$i")
                     make_target $pth clean
@@ -188,6 +191,7 @@ fi
 # If we're here, there wasn't any argument provided, so we just build
 # everything and copy the output.
 build_all
+build_doc
 copy_artifacts
 
 exit 0
\ No newline at end of file