diff --git a/ci/release_osx.sh b/ci/release_osx.sh
index 4d2f79aa2a..fddb0f5e7f 100755
--- a/ci/release_osx.sh
+++ b/ci/release_osx.sh
@@ -2,12 +2,16 @@
 if [ "$TRAVIS_EVENT_TYPE" != "cron" ]
 then
 export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/releases}
+export RELEASE=1
 else
+export RELEASE=0
 if [ "$TRAVIS_BRANCH" = "master" ]
 then
-export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge/osx}
+export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge}
+export LATEST_IMAGE=${LATEST_IMAGE:-/var/www/html/edge/osx}
 else
-export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge_webgl/osx}
+export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge_webgl}
+export LATEST_IMAGE=${LATEST_IMAGE:-/var/www/html/edge_webgl/osx}
 fi
 fi
 export DEPLOY_USER="${DEPLOY_USER:-ubuntu}"
@@ -16,10 +20,10 @@ if [ "$TRAVIS_EVENT_TYPE" != "cron" ]
 then
 REMOTE_DIR="${DEPLOY_DESTINATION}/${PX_VERSION}"
 else
-REMOTE_DIR="${DEPLOY_DESTINATION}"
+REMOTE_DIR="${DEPLOY_DESTINATION}/${TRAVIS_BUILD_ID}-${TRAVIS_COMMIT}-${TRAVIS_OS_NAME}"
 fi
 #since we saved $1 to REMOTE_HOST delete it from args via shift
-export REMOTE_FILE_COUNT=$(ssh -o StrictHostKeyChecking=no -p 2220 ${DEPLOY_USER}@${REMOTE_HOST} "ls -lrt $DEPLOY_DESTINATION|wc -l")
+export REMOTE_FILE_COUNT=$(ssh -o StrictHostKeyChecking=no -p 2220 ${DEPLOY_USER}@${REMOTE_HOST} "ls -lrt $DEPLOY_DESTINATION|grep -v '^l'|grep -v total|wc -l")
 export REMOTE_FILE_OLD=$(ssh -o StrictHostKeyChecking=no -p 2220 ${DEPLOY_USER}@${REMOTE_HOST} "ls -t $DEPLOY_DESTINATION|tail -1")
 export REMOTE_TEMPDIR=$(ssh -o StrictHostKeyChecking=no -p 2220 ${DEPLOY_USER}@${REMOTE_HOST} "mktemp -d")
 filename=$2
@@ -35,9 +39,16 @@ sudo tar -C $REMOTE_DIR -xvzf ${filename};
 sudo mv $REMOTE_DIR/release/* $REMOTE_DIR/. ;
 sudo rm -rf $REMOTE_DIR/release;
 sudo rm -rf ${REMOTE_TEMPDIR};
+if [ $RELEASE -eq 0 ]
+then
+sudo rm -rf ${LATEST_IMAGE}
+sudo ln -s ${REMOTE_DIR} ${LATEST_IMAGE}
+fi
 echo $REMOTE_FILE_COUNT;
-if [ $REMOTE_FILE_COUNT -gt 30 ]
+echo $REMOTE_FILE_OLD;
+if [ $REMOTE_FILE_COUNT -ge 8 ]
 then
-  sudo rm -rf $REMOTE_FILE_OLD;
+  echo \"Removing oldest file $REMOTE_FILE_OLD\";
+  sudo rm -rf $DEPLOY_DESTINATION/$REMOTE_FILE_OLD
 fi
 "
diff --git a/ci/uploadWindowsArtifact.sh b/ci/uploadWindowsArtifact.sh
index 14d4364dd7..7d519bcb1b 100755
--- a/ci/uploadWindowsArtifact.sh
+++ b/ci/uploadWindowsArtifact.sh
@@ -34,6 +34,24 @@ done
 filename="spark-setup.exe"
 DEPLOY_USER="${DEPLOY_USER:-ubuntu}"
 REMOTE_HOST="96.116.56.119"
-REMOTE_DIR="/var/www/html/edge/windows/sparkEdge-setup.exe"
+DEPLOY_DESTINATION="/var/www/html/edge/windows"
+REMOTE_IMAGE_PREFIX="/var/www/html/edge/windows/sparkEdge-setup"
+REMOTE_IMAGE_SUFFIX=".exe"
+REMOTE_IMAGE="$REMOTE_IMAGE_PREFIX-`date +%F`-$REMOTE_IMAGE_SUFFIX"
+LATEST_IMAGE="/var/www/html/edge/windows/sparkEdge-setup.exe"
+export REMOTE_FILE_COUNT=$(ssh -o StrictHostKeyChecking=no -p 2220 ${DEPLOY_USER}@${REMOTE_HOST} "ls -lrt $DEPLOY_DESTINATION|grep -v '^l'|grep -v total|wc -l")
+export REMOTE_FILE_OLD=$(ssh -o StrictHostKeyChecking=no -p 2220 ${DEPLOY_USER}@${REMOTE_HOST} "ls -t $DEPLOY_DESTINATION|tail -1")
 
-scp -P 2220 -o StrictHostKeyChecking=no ${filename} ${DEPLOY_USER}@${REMOTE_HOST}:${REMOTE_DIR}
+scp -P 2220 -o StrictHostKeyChecking=no ${filename} ${DEPLOY_USER}@${REMOTE_HOST}:${REMOTE_IMAGE}
+SSH="ssh -tt -o StrictHostKeyChecking=no -p 2220 -l ${DEPLOY_USER} ${REMOTE_HOST}"
+$SSH "set -e;
+sudo rm -rf ${LATEST_IMAGE}
+sudo ln -s ${REMOTE_IMAGE} ${LATEST_IMAGE}
+echo $REMOTE_FILE_COUNT;
+echo $REMOTE_FILE_OLD;
+if [ $REMOTE_FILE_COUNT -ge 8 ]
+then
+  echo \"Removing oldest file $REMOTE_FILE_OLD\";
+  sudo rm -rf $DEPLOY_DESTINATION/$REMOTE_FILE_OLD
+fi
+"
diff --git a/examples/pxScene2d/external/build.sh b/examples/pxScene2d/external/build.sh
index 21cabe055e..2656a0188e 100755
--- a/examples/pxScene2d/external/build.sh
+++ b/examples/pxScene2d/external/build.sh
@@ -56,7 +56,7 @@ make "-j${make_parallel}"
 make install -i
 rm -rf libcrypto.a
 rm -rf libssl.a
-rm -rf lib/ibcrypto.a
+rm -rf lib/libcrypto.a
 rm -rf lib/libssl.a
 cd ..
 export LD_LIBRARY_PATH="${OPENSSL_DIR}/:$LD_LIBRARY_PATH"