diff --git a/ci/Dockerfile-cfengine-build-package b/ci/Dockerfile-cfengine-build-package
index 65f1e8951..3a22d8090 100644
--- a/ci/Dockerfile-cfengine-build-package
+++ b/ci/Dockerfile-cfengine-build-package
@@ -1,5 +1,5 @@
 FROM ubuntu:20.04
 RUN apt-get update -y && apt-get install -y systemd wget sudo
-ADD "${NTECH_ROOT}/buildscripts/ci/setup.sh" /
+ADD setup.sh /
 RUN /bin/bash -c '/setup.sh 2>&1 > setup.log'
 CMD [ "/lib/systemd/systemd" ]
diff --git a/ci/docker-build-package.sh b/ci/docker-build-package.sh
index 7e5230c23..908b171dd 100755
--- a/ci/docker-build-package.sh
+++ b/ci/docker-build-package.sh
@@ -12,7 +12,7 @@ label=PACKAGES_HUB_x86_64_linux_ubuntu_20
 export JOB_BASE_NAME=label=$label
 
 
-docker build -t $name -f "${NTECH_ROOT}/buildscripts/ci/Dockerfile-$name" .
+docker build -t $name -f "${NTECH_ROOT}/buildscripts/ci/Dockerfile-$name" "${NTECH_ROOT}/buildscripts/ci"
 
 # add secret key to enable push up to sftp cache
 set +x # hide secrets
diff --git a/ci/setup.sh b/ci/setup.sh
index 124e48be8..39d9ce98f 100755
--- a/ci/setup.sh
+++ b/ci/setup.sh
@@ -7,10 +7,10 @@ PREFIX=/var/cfengine
 sudo rm -f /bin/rpm
 
 # Install dependencies
-sudo apt-get update -y
+sudo apt-get update -qy
 
 # install apt-utils so that debconf can configure installed packages
-sudo apt-get install apt-utils
+sudo apt-get install -qy apt-utils
 
 # git is needed for build-scripts/autogen to determine revision for such things as deps-packaging
 sudo apt-get install -qy git
@@ -25,7 +25,7 @@ sudo python2 get-pip.py
 sudo pip install psycopg2-binary
 
 # install composer and friends
-sudo apt-get -qq -y install curl php7.4-cli php7.4-curl php7.4-zip php7.4-mbstring php7.4-xml php7.4-gd composer php7.4-ldap
+sudo apt-get -qy install curl php7.4-cli php7.4-curl php7.4-zip php7.4-mbstring php7.4-xml php7.4-gd composer php7.4-ldap
 # packages needed for autogen
 sudo apt-get -qy install git autoconf automake m4 make bison flex \
  binutils libtool gcc g++ libc-dev libpam0g-dev python2 python3 psmisc
@@ -41,7 +41,7 @@ sudo apt-get -qq purge apache* "postgresql*" redis*
 
 # packages needed for installing Mission portal dependencies
 # remove any nodejs or node- packages currently in place
-sudo apt-get remove -y 'nodejs*' 'node-*'
+sudo apt-get remove -qy 'nodejs*' 'node-*'
 # replace with exact version we want
 wget -O - https://deb.nodesource.com/setup_12.x | sudo -E bash -
-sudo apt-get install -y nodejs
+sudo apt-get install -qy nodejs