diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index aef984f..4101f86 100755
--- a/bin/apt-dependencies.sh
+++ b/bin/apt-dependencies.sh
@@ -79,12 +79,14 @@
     vim-tiny screen \
 
 if [[ ${VERSION_CODENAME} == "xenial" ]]; then
+  apt remove -y ${VENV}
   apt install -y software-properties-common
   add-apt-repository ppa:deadsnakes/ppa
   apt-get update
-  apt install -y python3.7 python3.7-dev
+  apt install -y python3.7 python3.7-dev python3.7-venv
   rm /usr/bin/python3
   ln -s /usr/bin/python3.7 /usr/bin/python3
+  pip3 install --upgrade pip
   pip3 install setuptools
 fi
 
diff --git a/bin/yum-dependencies.sh b/bin/yum-dependencies.sh
index 1ededea..702cef1 100755
--- a/bin/yum-dependencies.sh
+++ b/bin/yum-dependencies.sh
@@ -177,8 +177,9 @@
 
 # js packages, as long as we're not told to skip them
 if [[ $1 != "nojs" ]]; then
+  if [[ ${VERSION_ID} -lt 8 ]]; then
   # config the CouchDB repo & install the JS packages
-  cat << EOF > /etc/yum.repos.d/binary-apache-couchdb.repo
+    cat << EOF > /etc/yum.repos.d/binary-apache-couchdb.repo
 [bintray--apache-couchdb-rpm]
 name=bintray--apache-couchdb-rpm
 baseurl=http://apache.bintray.com/couchdb-rpm/el${VERSION_ID}/${ARCH}/
@@ -186,8 +187,11 @@
 repo_gpgcheck=0
 enabled=1
 EOF
-  # install the JS packages
-  yum install -y couch-js-devel
+    # install the JS packages
+    yum install -y couch-js-devel
+  else
+    yum install -y mozjs60-devel
+  fi
 else
   # install js build-time dependencies only
   # we can't add the CouchDB repo here because the plat may not exist yet