diff --git a/README.md b/README.md
index fa213b8..d4323e9 100644
--- a/README.md
+++ b/README.md
@@ -14,4 +14,4 @@ Note: Need root permission.
 
 This will produce `alpine-virt-image-{timestamp}.qcow2.bz2` which can then be uploaded to Digital Ocean and used to create your droplet. Check out their instructions at https://blog.digitalocean.com/custom-images/ for uploading the image and creating your droplet.
 
-In this commit, the script will produce alpine `version 3.12` image. If you wanna build latest version, you can pull latest alpin-make-vm-image repo: `git submodule foreach git pull origin master`
+In this commit, the script will produce alpine `version 3.15` image. If you wanna build latest version, you can pull latest [alpine-make-vm-image repo](https://github.com/alpinelinux/alpine-make-vm-image): `git submodule foreach git pull origin master`
diff --git a/alpine-make-vm-image b/alpine-make-vm-image
index 149b6a2..b0f0a05 160000
--- a/alpine-make-vm-image
+++ b/alpine-make-vm-image
@@ -1 +1 @@
-Subproject commit 149b6a26ee94241d24bc659f850aa1919d309a7c
+Subproject commit b0f0a05b1848e0ff363cfbb36bf319fc02132caa
diff --git a/build-image.sh b/build-image.sh
index 059d792..030f4e8 100755
--- a/build-image.sh
+++ b/build-image.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+set -o errexit
+
 F=alpine-virt-image-$(date +%Y-%m-%d-%H%M)
 
 if [ "$CI" = "true" ]