diff --git a/.gitignore b/.gitignore
index 8dbd9bd9..757af59d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,11 @@
 *.exe
 *.tmp
 
+# CI build
+_downloads/**
+_output/**
+_watcom/**
+
 config.bat
 command.com
 config.mak
diff --git a/ci_build.sh b/ci_build.sh
index 40a342ab..fbbb13ae 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -9,10 +9,9 @@ else
 fi
 echo CI_BUILD_DIR is \"${CI_BUILD_DIR}\"
 
-OWTAR=ow-snapshot.tar.xz
-
-export PATH=$CI_BUILD_DIR/bin:$PATH:$CI_BUILD_DIR/_watcom/binl64
+# Open Watcom Environment Setup
 export WATCOM=$CI_BUILD_DIR/_watcom
+export PATH=$CI_BUILD_DIR/bin:$PATH:$WATCOM/binl64
 
 # Output directory
 rm -rf _output
@@ -25,7 +24,7 @@ LANGUAGES="english dutch finnish french german italian polish pt pt_br russian s
 for lng in ${LANGUAGES} ; do
   # Do full clean for rebuild of each language
   echo "Do full clean"
-  git clean -q -x -d -f -e _output -e _watcom -e $OWTAR
+  git clean -q -x -d -f -e _output -e _watcom -e _download
   export LNG=${lng}
   ./build.sh gcc
   TGT="_output/gcc/${LNG}"
@@ -37,7 +36,7 @@ done
 for lng in ${LANGUAGES} ; do
   # Do full clean for rebuild of each language
   echo "Do full clean"
-  git clean -q -x -d -f -e _output -e _watcom -e $OWTAR
+  git clean -q -x -d -f -e _output -e _watcom -e _download
   export LNG=${lng}
   ./build.sh wc
   TGT="_output/wc/${LNG}"
@@ -53,7 +52,7 @@ cp -v _output/gcc/english/command.com ${HOME}/.dosemu/drive_c/[Cc][Oo][Mm][Mm][A
 
 # Watcom (DOS) (slow so just English)
 mkdir -p _output/wc_dos/english
-git clean -q -x -d -f -e _output -e _watcom -e $OWTAR
+git clean -q -x -d -f -e _output -e _watcom -e _download
 {
   echo set COMPILER=WATCOM
   echo set WATCOM='C:\\devel\\watcomc'
diff --git a/ci_prereq.sh b/ci_prereq.sh
index 0b5ff2f2..b4f427df 100755
--- a/ci_prereq.sh
+++ b/ci_prereq.sh
@@ -13,24 +13,17 @@ sudo apt install dosemu2 dos2unix
 # GCC-IA16 for Linux
 sudo apt install gcc-ia16-elf libi86-ia16-elf
 
-# Watcom for Linux
-OWTAR=ow-snapshot.tar.xz
-if [ ! -d _watcom ] ; then
-  if [ ! -f $OWTAR ] ; then
-    echo "Downloading OpenWatcom compiler"
-    wget --no-verbose https://github.com/open-watcom/open-watcom-v2/releases/download/2023-02-01-Build/$OWTAR
-  fi
-  echo "Extracting OpenWatcom compiler"
-  mkdir _watcom
-  tar -C _watcom -xf $OWTAR
-fi
-
-# Common tools for DOS builds
+# Tools for DOS builds
 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'