diff --git a/Dockerfile.pulseaudio.template b/Dockerfile.pulseaudio.template
index 91f4108..c6c3e82 100644
--- a/Dockerfile.pulseaudio.template
+++ b/Dockerfile.pulseaudio.template
@@ -1,10 +1,10 @@
 ARG BALENA_ARCH=%%BALENA_ARCH%%
 
 # Build process from: https://git.alpinelinux.org/aports/tree/testing/librespot/APKBUILD
-FROM balenalib/$BALENA_ARCH-alpine:3.14 as librespot-builder
+FROM balenalib/$BALENA_ARCH-alpine:edge as librespot-builder
 WORKDIR /app
 
-ARG LIBRESPOT_VERSION=0.3.1
+ARG LIBRESPOT_VERSION=0.4.2
 
 RUN install_packages alsa-lib-dev pulseaudio-dev cargo curl
 
diff --git a/scripts/build-pulseaudio.sh b/scripts/build-pulseaudio.sh
index e2cb535..7b22594 100755
--- a/scripts/build-pulseaudio.sh
+++ b/scripts/build-pulseaudio.sh
@@ -38,11 +38,12 @@ function create_and_push_manifest() {
   docker manifest push $NAME:$TAG
 }
 
-LIBRESPOT_VERSION="0.3.1"
+LIBRESPOT_VERSION="0.4.2"
+DOCKER_NAMESPACE="tmigone"
 
-build_and_push_image "Dockerfile.pulseaudio.template" "tmigone/librespot:$LIBRESPOT_VERSION-pulseaudio-rpi" "rpi" "linux/arm/v6" "$LIBRESPOT_VERSION"
-build_and_push_image "Dockerfile.pulseaudio.template" "tmigone/librespot:$LIBRESPOT_VERSION-pulseaudio-armv7hf" "armv7hf" "linux/arm/v7" "$LIBRESPOT_VERSION"
-build_and_push_image "Dockerfile.pulseaudio.template" "tmigone/librespot:$LIBRESPOT_VERSION-pulseaudio-aarch64" "aarch64" "linux/arm64" "$LIBRESPOT_VERSION"
-build_and_push_image "Dockerfile.pulseaudio.template" "tmigone/librespot:$LIBRESPOT_VERSION-pulseaudio-amd64" "amd64" "linux/amd64" "$LIBRESPOT_VERSION"
+build_and_push_image "Dockerfile.pulseaudio.template" "${DOCKER_NAMESPACE}/librespot:$LIBRESPOT_VERSION-pulseaudio-rpi" "rpi" "linux/arm/v6" "$LIBRESPOT_VERSION"
+build_and_push_image "Dockerfile.pulseaudio.template" "${DOCKER_NAMESPACE}/librespot:$LIBRESPOT_VERSION-pulseaudio-armv7hf" "armv7hf" "linux/arm/v7" "$LIBRESPOT_VERSION"
+build_and_push_image "Dockerfile.pulseaudio.template" "${DOCKER_NAMESPACE}/librespot:$LIBRESPOT_VERSION-pulseaudio-aarch64" "aarch64" "linux/arm64" "$LIBRESPOT_VERSION"
+build_and_push_image "Dockerfile.pulseaudio.template" "${DOCKER_NAMESPACE}/librespot:$LIBRESPOT_VERSION-pulseaudio-amd64" "amd64" "linux/amd64" "$LIBRESPOT_VERSION"
 
-create_and_push_manifest "tmigone/librespot" "$LIBRESPOT_VERSION-pulseaudio"
\ No newline at end of file
+create_and_push_manifest "${DOCKER_NAMESPACE}/librespot" "$LIBRESPOT_VERSION-pulseaudio"