diff --git a/Dockerfile b/Dockerfile
index 5db0e83..ac01c11 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,25 +13,29 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 ENV SONARR_BRANCH="develop"
 
 RUN \
- if [ -z ${SONARR_VERSION+x} ]; then \
-	SONARR_VERSION=$(curl -sX GET http://apt.sonarr.tv/dists/${SONARR_BRANCH}/main/binary-amd64/Packages \
-	|grep -A 6 -m 1 "Package: nzbdrone" | awk -F ": " '/Version/{print $2;exit}'); \
- fi && \
- echo "**** add sonarr repository ****" && \
- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC && \
- echo "deb http://apt.sonarr.tv/ ${SONARR_BRANCH} main" > \
-	/etc/apt/sources.list.d/sonarr.list && \
  echo "**** install packages ****" && \
  apt-get update && \
  apt-get install -y \
-	nzbdrone=${SONARR_VERSION} && \
+        jq && \
+ echo "**** install sonarr ****" && \
+ mkdir -p /opt/NzbDrone && \
+  if [ -z ${SONARR_VERSION+x} ]; then \
+	SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/download/${SONARR_BRANCH} \
+	| 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" && \
+ tar xf \
+	/tmp/sonarr.tar.gz -C \
+	/opt/NzbDrone --strip-components=1 && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
 	/tmp/* \
-	/var/lib/apt/lists/* \
 	/var/tmp/*
 
+
 # add local files
 COPY root/ /
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 870a5f5..dfa8da1 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -17,22 +17,27 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 ARG SONARR_BRANCH="develop"
 
 RUN \
- if [ -z ${SONARR_VERSION+x} ]; then \
-        SONARR_VERSION=$(curl -sX GET http://apt.sonarr.tv/dists/${SONARR_BRANCH}/main/binary-amd64/Packages \
-        |grep -A 6 -m 1 "Package: nzbdrone" | awk -F ": " '/Version/{print $2;exit}'); \
- fi && \
+ echo "**** install packages ****" && \
+ apt-get update && \
+ apt-get install -y \
+        jq && \
  echo "**** install sonarr ****" && \
- mkdir -p \
-	/opt/NzbDrone && \
+ mkdir -p /opt/NzbDrone && \
+  if [ -z ${SONARR_VERSION+x} ]; then \
+	SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/download/${SONARR_BRANCH} \
+	| jq -r '.version'); \
+ fi && \
  curl -o \
- /tmp/sonarr.tar.gz -L \
+	/tmp/sonarr.tar.gz -L \
 	"http://download.sonarr.tv/v2/${SONARR_BRANCH}/mono/NzbDrone.${SONARR_BRANCH}.${SONARR_VERSION}.mono.tar.gz" && \
  tar xf \
- /tmp/sonarr.tar.gz -C \
+	/tmp/sonarr.tar.gz -C \
 	/opt/NzbDrone --strip-components=1 && \
  echo "**** cleanup ****" && \
+ apt-get clean && \
  rm -rf \
-	/tmp/*
+	/tmp/* \
+	/var/tmp/*
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 7bf2f60..11988b2 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -16,23 +16,26 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 ENV SONARR_BRANCH="develop"
 
 RUN \
- if [ -z ${SONARR_VERSION+x} ]; then \
-	SONARR_VERSION=$(curl -sX GET http://apt.sonarr.tv/dists/${SONARR_BRANCH}/main/binary-amd64/Packages \
-	|grep -A 6 -m 1 "Package: nzbdrone" | awk -F ": " '/Version/{print $2;exit}'); \
- fi && \
- echo "**** add sonarr repository ****" && \
- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC && \
- echo "deb http://apt.sonarr.tv/ ${SONARR_BRANCH} main" > \
-	/etc/apt/sources.list.d/sonarr.list && \
  echo "**** install packages ****" && \
  apt-get update && \
  apt-get install -y \
-	nzbdrone=${SONARR_VERSION} && \
+        jq && \
+ echo "**** install sonarr ****" && \
+ mkdir -p /opt/NzbDrone && \
+  if [ -z ${SONARR_VERSION+x} ]; then \
+	SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/download/${SONARR_BRANCH} \
+	| 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" && \
+ tar xf \
+	/tmp/sonarr.tar.gz -C \
+	/opt/NzbDrone --strip-components=1 && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
 	/tmp/* \
-	/var/lib/apt/lists/* \
 	/var/tmp/*
 
 # add local files
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 8e7aac1..db9fb79 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-sonarr
 external_type: na
-custom_version_command: "curl -sX GET http://apt.sonarr.tv/dists/develop/main/binary-amd64/Packages |grep -A 6 -m 1 'Package: nzbdrone' | awk -F ': ' '/Version/{print $2;exit}'"
+custom_version_command: "curl -sX GET http://services.sonarr.tv/v1/download/develop | jq -r '.version'"
 release_type: prerelease
 release_tag: develop
 ls_branch: develop