diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9a3fd34..951124a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,8 +11,8 @@ jobs:
 
     - run: |
         docker build runner -t runner
-        docker run --privileged --rm -v /dev:/dev:ro -v "$PWD":/runner -w /runner -e ALPINE_BRANCH=latest-stable -e ALPINE_MIRROR="http://dl-cdn.alpinelinux.org/alpine" -e ARCH=aarch64 runner ./make-image
-        docker run --privileged --rm -v /dev:/dev:ro -v "$PWD":/runner -w /runner -e ALPINE_BRANCH=latest-stable -e ALPINE_MIRROR="http://dl-cdn.alpinelinux.org/alpine" -e ARCH=armhf runner ./make-image
+        docker run --privileged --rm -v /dev:/dev:ro -v "$PWD":/runner -w /runner -e ALPINE_BRANCH=edge -e ALPINE_MIRROR="http://dl-cdn.alpinelinux.org/alpine" -e ARCH=aarch64 runner ./make-image
+        docker run --privileged --rm -v /dev:/dev:ro -v "$PWD":/runner -w /runner -e ALPINE_BRANCH=edge -e ALPINE_MIRROR="http://dl-cdn.alpinelinux.org/alpine" -e ARCH=armhf runner ./make-image
 
     - env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/bootstrap/99-first-boot b/bootstrap/99-first-boot
index 4137478..1552c26 100755
--- a/bootstrap/99-first-boot
+++ b/bootstrap/99-first-boot
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -x
+set -xe
 
 apk add dosfstools e2fsprogs-extra parted
 
@@ -34,5 +34,5 @@ depend() {
 EOF
 
 chmod +x /etc/init.d/first-boot /usr/bin/first-boot
-rc-update --verbose --update --nocolor add first-boot || true
+rc-update --verbose --update add first-boot
 
diff --git a/make-image b/make-image
index e3948fc..84ba847 100755
--- a/make-image
+++ b/make-image
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -xe
+set -x
 
 mkdir -p dist /dist
 
@@ -38,11 +38,6 @@ mount --make-private "$ROOT_DEV" /alpine
 mkdir -p /alpine/boot
 mount --make-private "$BOOT_DEV" /alpine/boot
 
-IMGID="$(dd if="${OUTPUT_IMG}" skip=440 bs=1 count=4 2>/dev/null | xxd -e | cut -f 2 -d' ')"
-
-BOOT_PARTUUID="${IMGID}-01"
-ROOT_PARTUUID="${IMGID}-02"
-
 apt-get update
 curl https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/master/alpine-chroot-install | sh