diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
index e6f9fd3..5d5c074 100755
--- a/scripts/entrypoint.sh
+++ b/scripts/entrypoint.sh
@@ -1,7 +1,14 @@
 #!/bin/sh
 set -euo pipefail
 
-exec /usr/bin/cloud-hypervisor \
+
+_stop() {
+  ch-remote shutdown-vmm
+}
+
+trap _stop EXIT TERM
+
+/usr/bin/cloud-hypervisor \
   --kernel /boot/vmlinuz-virt --initramfs /boot/initramfs-virt \
   --disk path=/image/vm.raw,image_type=raw \
   --disk path=/image/data.raw,direct=on,image_type=raw \
diff --git a/scripts/setup-hypervisor.sh b/scripts/setup-hypervisor.sh
index e7089cd..64696c6 100755
--- a/scripts/setup-hypervisor.sh
+++ b/scripts/setup-hypervisor.sh
@@ -3,13 +3,18 @@
 set -u
 
 echo "fetching latest version of cloud-hypervisor"
-DOWNLOAD_URL=$(curl https://api.github.com/repos/cloud-hypervisor/cloud-hypervisor/releases | jq -r '.[0].assets.[] | select( .name == "cloud-hypervisor-static") | .browser_download_url')
+RESPONSE=$(curl https://api.github.com/repos/cloud-hypervisor/cloud-hypervisor/releases)
+HYPERVISOR_URL=$(echo $RESPONSE | jq -r '.[0].assets.[] | select( .name == "cloud-hypervisor-static") | .browser_download_url')
+CH_REMOTE_URL=$(echo $RESPONSE | jq -r '.[0].assets.[] | select( .name == "ch-remote-static") | .browser_download_url' )
+
 if [ $? -ne 0 ]; then
     echo "FAILED TO FETCH DOWNLOAD LINK OF CLOUD-HYPERVISOR-STATIC"
     exit -1
 fi
 
-curl -sLo /usr/bin/cloud-hypervisor $DOWNLOAD_URL && chmod +x /usr/bin/cloud-hypervisor && cloud-hypervisor --help
+curl -sLo /usr/bin/cloud-hypervisor "$HYPERVISOR_URL" && chmod +x /usr/bin/cloud-hypervisor && cloud-hypervisor --help >/dev/null 2>&1 
+
+curl -sLo /usr/bin/ch-remote "$CH_REMOTE_URL" && chmod +x /usr/bin/ch-remote && ch-remote --help >/dev/null 2>&1
 
 if [ $? -ne 0 ]; then
     echo "FAILED TO DOWNLOAD CLOUD-HYPERVISOR or CLOUD-HYPERVISOR IS NOT EXECUTABLE. (wrong arch?)"