diff --git a/Dockerfile.pulseaudio.template b/Dockerfile.pulseaudio.template
index c6c3e82..9dd7b6a 100644
--- a/Dockerfile.pulseaudio.template
+++ b/Dockerfile.pulseaudio.template
@@ -1,14 +1,14 @@
 ARG BALENA_ARCH=%%BALENA_ARCH%%
 
 # Build process from: https://git.alpinelinux.org/aports/tree/testing/librespot/APKBUILD
-FROM balenalib/$BALENA_ARCH-alpine:edge as librespot-builder
+FROM balenalib/$BALENA_ARCH-alpine:edge AS librespot-builder
 WORKDIR /app
 
 ARG LIBRESPOT_VERSION=0.4.2
 
 RUN install_packages alsa-lib-dev pulseaudio-dev cargo curl
 
-RUN curl -sL "https://github.com/librespot-org/librespot/archive/refs/tags/v${LIBRESPOT_VERSION}.tar.gz" --output librespot.tar.gz && \
+RUN curl -sL "https://github.com/librespot-org/librespot/archive/dev.tar.gz" --output librespot.tar.gz && \
   mkdir /app/librespot-src && \
   tar -zxvf librespot.tar.gz --directory /app/librespot-src --strip-components=1
 
diff --git a/scripts/build-pulseaudio.sh b/scripts/build-pulseaudio.sh
index 7b22594..c9a1262 100755
--- a/scripts/build-pulseaudio.sh
+++ b/scripts/build-pulseaudio.sh
@@ -38,8 +38,8 @@ function create_and_push_manifest() {
   docker manifest push $NAME:$TAG
 }
 
-LIBRESPOT_VERSION="0.4.2"
-DOCKER_NAMESPACE="tmigone"
+LIBRESPOT_VERSION="0.4.2-dev"
+DOCKER_NAMESPACE="brettmillerit"
 
 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"