diff --git a/Dockerfile b/Dockerfile
index 9d0fa2a..d5ffd3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,7 +47,7 @@ RUN \
 	mxml-dev && \
  echo "**** make antlr wrapper ****" && \
  mkdir -p \
-	/tmp/source/forked-daapd && \
+	/tmp/source/owntone && \
  echo \
 	"#!/bin/bash" > /tmp/source/antlr3 && \
  echo \
@@ -83,9 +83,9 @@ RUN \
  /tmp/source/forked.tar.gz -L \
 	"https://github.com/owntone/owntone-server/archive/${DAAPD_RELEASE}.tar.gz" && \
  tar xf /tmp/source/forked.tar.gz -C \
-	/tmp/source/forked-daapd --strip-components=1 && \
+	/tmp/source/owntone --strip-components=1 && \
  export PATH="/tmp/source:$PATH" && \
- cd /tmp/source/forked-daapd && \
+ cd /tmp/source/owntone && \
  autoreconf -i -v && \
  ./configure \
 	--build=$CBUILD \
@@ -102,7 +102,7 @@ RUN \
 	--sysconfdir=/etc && \
  make && \
  make DESTDIR=/tmp/daapd-build install && \
- mv /tmp/daapd-build/etc/forked-daapd.conf /tmp/daapd-build/etc/forked-daapd.conf.orig
+ mv /tmp/daapd-build/etc/owntone.conf /tmp/daapd-build/etc/owntone.conf.orig
 ############## runtime stage ##############
 FROM ghcr.io/linuxserver/baseimage-alpine:3.12
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index a8d2920..e5720bd 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -45,7 +45,7 @@ RUN \
 	mxml-dev && \
  echo "**** make antlr wrapper ****" && \
  mkdir -p \
-	/tmp/source/forked-daapd && \
+	/tmp/source/owntone && \
  echo \
 	"#!/bin/bash" > /tmp/source/antlr3 && \
  echo \
@@ -74,9 +74,9 @@ RUN \
  /tmp/source/forked.tar.gz -L \
 	"https://github.com/owntone/owntone-server/archive/${DAAPD_RELEASE}.tar.gz" && \
  tar xf /tmp/source/forked.tar.gz -C \
-	/tmp/source/forked-daapd --strip-components=1 && \
+	/tmp/source/owntone --strip-components=1 && \
  export PATH="/tmp/source:$PATH" && \
- cd /tmp/source/forked-daapd && \
+ cd /tmp/source/owntone && \
  autoreconf -i -v && \
  ./configure \
 	--build=$CBUILD \
@@ -93,7 +93,7 @@ RUN \
 	--sysconfdir=/etc && \
  make && \
  make DESTDIR=/tmp/daapd-build install && \
- mv /tmp/daapd-build/etc/forked-daapd.conf /tmp/daapd-build/etc/forked-daapd.conf.orig
+ mv /tmp/daapd-build/etc/owntone.conf /tmp/daapd-build/etc/owntone.conf.orig
 ############## runtime stage ##############
 FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12
 
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 43732c6..6df8185 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -47,7 +47,7 @@ RUN \
 	mxml-dev && \
  echo "**** make antlr wrapper ****" && \
  mkdir -p \
-	/tmp/source/forked-daapd && \
+	/tmp/source/owntone && \
  echo \
 	"#!/bin/bash" > /tmp/source/antlr3 && \
  echo \
@@ -81,9 +81,9 @@ RUN \
  /tmp/source/forked.tar.gz -L \
 	"https://github.com/owntone/owntone-server/archive/${DAAPD_RELEASE}.tar.gz" && \
  tar xf /tmp/source/forked.tar.gz -C \
-	/tmp/source/forked-daapd --strip-components=1 && \
+	/tmp/source/owntone --strip-components=1 && \
  export PATH="/tmp/source:$PATH" && \
- cd /tmp/source/forked-daapd && \
+ cd /tmp/source/owntone && \
  autoreconf -i -v && \
  ./configure \
 	--build=$CBUILD \
@@ -100,7 +100,7 @@ RUN \
 	--sysconfdir=/etc && \
  make && \
  make DESTDIR=/tmp/daapd-build install && \
- mv /tmp/daapd-build/etc/forked-daapd.conf /tmp/daapd-build/etc/forked-daapd.conf.orig
+ mv /tmp/daapd-build/etc/owntone.conf /tmp/daapd-build/etc/owntone.conf.orig
 ############## runtime stage ##############
 FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12