diff --git a/Dockerfile b/Dockerfile
index d0a14b8..557525a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN \
  apt-get install -y \
         jq && \
  echo "**** install sonarr ****" && \
- mkdir -p /usr/lib/sonarr/bin && \
+ mkdir -p /app/sonarr/bin && \
   if [ -z ${SONARR_VERSION+x} ]; then \
 	SONARR_VERSION=$(curl -sX GET https://services.sonarr.tv/v1/download/${SONARR_BRANCH}?version=3 \
 	| jq -r '.version'); \
@@ -28,9 +28,9 @@ RUN \
 	"https://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
  tar xf \
 	/tmp/sonarr.tar.gz -C \
-	/usr/lib/sonarr/bin --strip-components=1 && \
- echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /usr/lib/sonarr/package_info && \
- rm -rf /usr/lib/sonarr/bin/Sonarr.Update && \
+	/app/sonarr/bin --strip-components=1 && \
+ echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/sonarr/package_info && \
+ rm -rf /app/sonarr/bin/Sonarr.Update && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index dccaf17..7c44a52 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -18,7 +18,7 @@ RUN \
  apt-get install -y \
         jq && \
  echo "**** install sonarr ****" && \
- mkdir -p /usr/lib/sonarr/bin && \
+ mkdir -p /app/sonarr/bin && \
   if [ -z ${SONARR_VERSION+x} ]; then \
 	SONARR_VERSION=$(curl -sX GET https://services.sonarr.tv/v1/download/${SONARR_BRANCH}?version=3 \
 	| jq -r '.version'); \
@@ -28,9 +28,9 @@ RUN \
 	"https://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
  tar xf \
 	/tmp/sonarr.tar.gz -C \
-	/usr/lib/sonarr/bin --strip-components=1 && \
- echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /usr/lib/sonarr/package_info && \
- rm -rf /usr/lib/sonarr/bin/Sonarr.Update && \
+	/app/sonarr/bin --strip-components=1 && \
+ echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/sonarr/package_info && \
+ rm -rf /app/sonarr/bin/Sonarr.Update && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index a7c3071..c3ed6f1 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -18,7 +18,7 @@ RUN \
  apt-get install -y \
         jq && \
  echo "**** install sonarr ****" && \
- mkdir -p /usr/lib/sonarr/bin && \
+ mkdir -p /app/sonarr/bin && \
   if [ -z ${SONARR_VERSION+x} ]; then \
 	SONARR_VERSION=$(curl -sX GET https://services.sonarr.tv/v1/download/${SONARR_BRANCH}?version=3 \
 	| jq -r '.version'); \
@@ -28,9 +28,9 @@ RUN \
 	"https://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
  tar xf \
 	/tmp/sonarr.tar.gz -C \
-	/usr/lib/sonarr/bin --strip-components=1 && \
- echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /usr/lib/sonarr/package_info && \
- rm -rf /usr/lib/sonarr/bin/Sonarr.Update && \
+	/app/sonarr/bin --strip-components=1 && \
+ echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/sonarr/package_info && \
+ rm -rf /app/sonarr/bin/Sonarr.Update && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
index d9d3f2e..55f6b62 100644
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -6,5 +6,5 @@
 
 # permissions
 chown -R abc:abc \
-	/usr/lib/sonarr \
+	/app/sonarr \
 	/config
diff --git a/root/etc/services.d/sonarr/run b/root/etc/services.d/sonarr/run
index d01b7e4..6b3cb82 100644
--- a/root/etc/services.d/sonarr/run
+++ b/root/etc/services.d/sonarr/run
@@ -1,10 +1,9 @@
 #!/usr/bin/with-contenv bash
 
 UMASK_SET=${UMASK_SET:-022}
-
 umask "$UMASK_SET"
 
-cd /usr/lib/sonarr/bin || exit
+cd /app/sonarr/bin || exit
 
 exec \
 	s6-setuidgid abc mono --debug Sonarr.exe \