diff --git a/ci_build.sh b/ci_build.sh
index fbbd573..b10882f 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -28,17 +28,7 @@ mv -n bin/country.sys _output/gcc/.
 mv -n share/src/share.com _output/gcc/.
 mv -n share/src/share.map _output/gcc/.
 
-# Watcom
-OWTAR=ow-snapshot.tar.xz
-if [ ! -d _watcom ] ; then
-  mkdir -p _downloads
-  mkdir _watcom
-  if [ ! -f _downloads/$OWTAR ] ; then
-    (cd _downloads && wget --no-verbose https://github.com/open-watcom/open-watcom-v2/releases/download/Last-CI-build/$OWTAR)
-  fi
-  (cd _watcom && tar -xf ../_downloads/$OWTAR)
-fi
-
+# Open Watcom Environment Setup
 export WATCOM=$BUILD_DIR/_watcom
 export PATH=$BUILD_DIR/bin:$PATH:$WATCOM/binl64
 
diff --git a/ci_prereq.sh b/ci_prereq.sh
index 5d50720..a67cfc8 100755
--- a/ci_prereq.sh
+++ b/ci_prereq.sh
@@ -14,10 +14,15 @@ sudo apt install dosemu2 dos2unix
 #    Perhaps later we should build using Freecom from published package
 
 mkdir -p _downloads
+mkdir -p _watcom
 cd _downloads
 
 HERE=$(pwd)
 
+# download and unpack Open Watcom snapshot
+[ -f ow-snapshot.tar.xz ] || wget --no-verbose https://github.com/open-watcom/open-watcom-v2/releases/download/Current-build/ow-snapshot.tar.xz
+tar -C ../_watcom -xf ow-snapshot.tar.xz
+
 #IBIBLIO_PATH='http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.2/repos'
 IBIBLIO_PATH='https://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/repositories/1.3'