diff --git a/Dockerfile b/Dockerfile
index ac01c11..deeb61d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ LABEL maintainer="sparklyballs"
 # set environment variables
 ARG DEBIAN_FRONTEND="noninteractive"
 ENV XDG_CONFIG_HOME="/config/xdg"
-ENV SONARR_BRANCH="develop"
+ENV SONARR_BRANCH="phantom-develop"
 
 RUN \
  echo "**** install packages ****" && \
@@ -18,17 +18,17 @@ RUN \
  apt-get install -y \
         jq && \
  echo "**** install sonarr ****" && \
- mkdir -p /opt/NzbDrone && \
+ mkdir -p /opt/sonarr && \
   if [ -z ${SONARR_VERSION+x} ]; then \
-	SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/download/${SONARR_BRANCH} \
+	SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/download/${SONARR_BRANCH}?version=3 \
 	| jq -r '.version'); \
  fi && \
  curl -o \
 	/tmp/sonarr.tar.gz -L \
-	"http://download.sonarr.tv/v2/${SONARR_BRANCH}/mono/NzbDrone.${SONARR_BRANCH}.${SONARR_VERSION}.mono.tar.gz" && \
+	"http://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
  tar xf \
 	/tmp/sonarr.tar.gz -C \
-	/opt/NzbDrone --strip-components=1 && \
+	/opt/sonarr --strip-components=1 && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index dfa8da1..52d3c1d 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -11,10 +11,9 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="sparklyballs"
 
 # set environment variables
+ARG DEBIAN_FRONTEND="noninteractive"
 ENV XDG_CONFIG_HOME="/config/xdg"
-
-# package versions
-ARG SONARR_BRANCH="develop"
+ENV SONARR_BRANCH="phantom-develop"
 
 RUN \
  echo "**** install packages ****" && \
@@ -22,17 +21,17 @@ RUN \
  apt-get install -y \
         jq && \
  echo "**** install sonarr ****" && \
- mkdir -p /opt/NzbDrone && \
+ mkdir -p /opt/sonarr && \
   if [ -z ${SONARR_VERSION+x} ]; then \
-	SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/download/${SONARR_BRANCH} \
+	SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/download/${SONARR_BRANCH}?version=3 \
 	| jq -r '.version'); \
  fi && \
  curl -o \
 	/tmp/sonarr.tar.gz -L \
-	"http://download.sonarr.tv/v2/${SONARR_BRANCH}/mono/NzbDrone.${SONARR_BRANCH}.${SONARR_VERSION}.mono.tar.gz" && \
+	"http://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
  tar xf \
 	/tmp/sonarr.tar.gz -C \
-	/opt/NzbDrone --strip-components=1 && \
+	/opt/sonarr --strip-components=1 && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 11988b2..d45b012 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -13,7 +13,7 @@ LABEL maintainer="sparklyballs"
 # set environment variables
 ARG DEBIAN_FRONTEND="noninteractive"
 ENV XDG_CONFIG_HOME="/config/xdg"
-ENV SONARR_BRANCH="develop"
+ENV SONARR_BRANCH="phantom-develop"
 
 RUN \
  echo "**** install packages ****" && \
@@ -21,17 +21,17 @@ RUN \
  apt-get install -y \
         jq && \
  echo "**** install sonarr ****" && \
- mkdir -p /opt/NzbDrone && \
+ mkdir -p /opt/sonarr && \
   if [ -z ${SONARR_VERSION+x} ]; then \
-	SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/download/${SONARR_BRANCH} \
+	SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/download/${SONARR_BRANCH}?version=3 \
 	| jq -r '.version'); \
  fi && \
  curl -o \
 	/tmp/sonarr.tar.gz -L \
-	"http://download.sonarr.tv/v2/${SONARR_BRANCH}/mono/NzbDrone.${SONARR_BRANCH}.${SONARR_VERSION}.mono.tar.gz" && \
+	"http://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
  tar xf \
 	/tmp/sonarr.tar.gz -C \
-	/opt/NzbDrone --strip-components=1 && \
+	/opt/sonarr --strip-components=1 && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index db9fb79..8625821 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,10 +3,10 @@
 # jenkins variables
 project_name: docker-sonarr
 external_type: na
-custom_version_command: "curl -sX GET http://services.sonarr.tv/v1/download/develop | jq -r '.version'"
+custom_version_command: "curl -sX GET http://services.sonarr.tv/v1/download/phantom-develop?version=3 | jq -jr '.version'"
 release_type: prerelease
-release_tag: develop
-ls_branch: develop
+release_tag: preview
+ls_branch: preview
 repo_vars:
   - BUILD_VERSION_ARG = 'SONARR_VERSION'
   - LS_USER = 'linuxserver'