diff --git a/VCAC-A/Intel_Media_Analytics_Host/scripts/build.sh b/VCAC-A/Intel_Media_Analytics_Host/scripts/build.sh
index 1c55867..c847ee1 100755
--- a/VCAC-A/Intel_Media_Analytics_Host/scripts/build.sh
+++ b/VCAC-A/Intel_Media_Analytics_Host/scripts/build.sh
@@ -437,6 +437,7 @@ build_kernel_and_modules() {
 	# apply modules patch
 	[ ${NO_CLEAN} -eq 0 ] && _extract_tgz "${MODULES_PATCH_ARCHIVE}" "${_MODULES_PATCH_DIR}"
 	[ ${NO_CLEAN} -eq 0 ] && _apply_patch_git "${_MODULES_DIR}" "${_MODULES_PATCH_DIR}" "${MODULES_SRC_NAME}"
+
 	# build kernel
 	rm -rf ${_HOST_PKG_DIR}/kernel*.rpm || die "Failed to remove previous kernel rpms"
 
@@ -462,7 +463,7 @@ build_kernel_and_modules() {
 
 	_copy /root/rpmbuild/SRPMS/vcass-modules*.rpm ${_HOST_PKG_DIR}
 	_copy /root/rpmbuild/RPMS/x86_64/vcass-modules*.rpm ${_HOST_PKG_DIR}
-        
+
 	debug ${DEBUG_LEVEL} "-- build_kernel_and_modules"
 }
 
@@ -496,7 +497,6 @@ build_vcaa_daemon() {
 	BOOST_ROOT=${_DAEMON_DIR}/${BOOST_NAME} OS=CENTOS WORKSPACE=/tmp/tmp-test PKG_VER=2.7.3 MODULES_SRC=../modules/ ${_DOWNLOAD_DIR}/VCAC-SW-VCAC-A_R2/apps/generate_apps.sh
 	_copy /tmp/tmp-test/daemon-vca*.rpm ${_HOST_PKG_DIR}
 
-
 	debug ${DEBUG_LEVEL} "-- build_vcaa_daemon"
 }
 
diff --git a/VCAC-A/Intel_Media_Analytics_Host/tar/vca_query-1.0-1.x86_64.rpm b/VCAC-A/Intel_Media_Analytics_Host/tar/vca_query-1.0-1.x86_64.rpm
new file mode 100644
index 0000000..9086392
Binary files /dev/null and b/VCAC-A/Intel_Media_Analytics_Host/tar/vca_query-1.0-1.x86_64.rpm differ
diff --git a/VCAC-A/Intel_Media_Analytics_Node/scripts/vcad_build.sh b/VCAC-A/Intel_Media_Analytics_Node/scripts/vcad_build.sh
index e97ecf7..9fdcde2 100755
--- a/VCAC-A/Intel_Media_Analytics_Node/scripts/vcad_build.sh
+++ b/VCAC-A/Intel_Media_Analytics_Node/scripts/vcad_build.sh
@@ -42,7 +42,7 @@ readonly OPENVNO_DATE="2020.1.023"
 readonly OPENVNO_NAME="l_openvino_toolkit_p_$OPENVNO_DATE.tgz"
 readonly OPENVNO_LINK="http://registrationcenter-download.intel.com/akdlm/irc_nas/16345/${OPENVNO_NAME}"
 
-readonly KERNEL_PATCH_ARCHIVE="${TAR_DIR}/k4.19.87_patch.tar.gz"
+readonly KERNEL_PATCH_ARCHIVE="${TAR_DIR}/ubuntu18.04_kernel4.19.87_patch.tar.gz"
 readonly MODULES_PATCH_ARCHIVE="${TAR_DIR}/vcass-modules-4.19-patch.tar.gz"
 
 readonly VCAA_DOCKER_NAME="vcaa/ubuntu-18.04-test"
diff --git a/VCAC-A/Intel_Media_Analytics_Node/tar/ubuntu16.04_kernel4.19_patch.tar.gz b/VCAC-A/Intel_Media_Analytics_Node/tar/ubuntu16.04_kernel4.19_patch.tar.gz
deleted file mode 100644
index afe5d94..0000000
Binary files a/VCAC-A/Intel_Media_Analytics_Node/tar/ubuntu16.04_kernel4.19_patch.tar.gz and /dev/null differ
diff --git a/VCAC-A/Intel_Media_Analytics_Node/tar/ubuntu18.04_kernel4.19.87_patch.tar.gz b/VCAC-A/Intel_Media_Analytics_Node/tar/ubuntu18.04_kernel4.19.87_patch.tar.gz
new file mode 100644
index 0000000..fadd597
Binary files /dev/null and b/VCAC-A/Intel_Media_Analytics_Node/tar/ubuntu18.04_kernel4.19.87_patch.tar.gz differ