diff --git a/Dockerfile b/Dockerfile
index e3a7854..0ba7e27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,26 +16,27 @@ RUN \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	gnupg && \
- echo "**** add jellyfin deps *****" && \
+ echo "**** install jellyfin *****" && \
  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
  echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu bionic main' > /etc/apt/sources.list.d/jellyfin.list && \
+ echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu bionic unstable' >> /etc/apt/sources.list.d/jellyfin.list && \
+ if [ -z ${JELLYFIN_RELEASE+x} ]; then \
+        JELLYFIN="jellyfin"; \
+ else \
+        JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
+ fi && \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	at \
 	i965-va-driver \
+	${JELLYFIN} \
 	jellyfin-ffmpeg \
+	jellyfin-server \
+	jellyfin-web \
 	libfontconfig1 \
 	libfreetype6 \
-	libssl1.0.0 \
+	libssl1.1 \
 	mesa-va-drivers && \
- echo "**** install jellyfin *****" && \
- if [ -z ${JELLYFIN_RELEASE+x} ]; then \
-	JELLYFIN="jellyfin-server-nightly jellyfin-web-nightly"; \
- else \
-	JELLYFIN="jellyfin-server-nightly=${JELLYFIN_RELEASE} jellyfin-web-nightly=${JELLYFIN_RELEASE}"; \
- fi && \
- apt-get install -y \
-	${JELLYFIN} && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index c2c107f..fae873c 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -16,26 +16,29 @@ RUN \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	gnupg && \
- echo "**** add jellyfin deps *****" && \
+ echo "**** install jellyfin *****" && \
  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
+ curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \
  echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu bionic main' > /etc/apt/sources.list.d/jellyfin.list && \
+ echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu bionic unstable' >> /etc/apt/sources.list.d/jellyfin.list && \
+ echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa/ubuntu bionic main">> /etc/apt/sources.list.d/raspbins.list && \
+ if [ -z ${JELLYFIN_RELEASE+x} ]; then \
+	JELLYFIN="jellyfin"; \
+ else \
+	JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
+ fi && \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	at \
+	${JELLYFIN} \
 	jellyfin-ffmpeg \
+	jellyfin-server \
+	jellyfin-web \
 	libfontconfig1 \
 	libfreetype6 \
 	libomxil-bellagio0 \
 	libomxil-bellagio-bin \
-	libssl1.0.0 && \
- echo "**** install jellyfin *****" && \
- if [ -z ${JELLYFIN_RELEASE+x} ]; then \
-	JELLYFIN="jellyfin-server-nightly jellyfin-web-nightly"; \
- else \
-	JELLYFIN="jellyfin-server-nightly=${JELLYFIN_RELEASE} jellyfin-web-nightly=${JELLYFIN_RELEASE}"; \
- fi && \
- apt-get install -y \
-	${JELLYFIN} && \
+	libssl1.1 && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index f272bed..00fd818 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -16,29 +16,30 @@ RUN \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	gnupg && \
- echo "**** add jellyfin deps *****" && \
+ echo "**** install jellyfin *****" && \
  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
  curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \
  echo 'deb [arch=armhf] https://repo.jellyfin.org/ubuntu bionic main' > /etc/apt/sources.list.d/jellyfin.list && \
+ echo 'deb [arch=armhf] https://repo.jellyfin.org/ubuntu bionic unstable' >> /etc/apt/sources.list.d/jellyfin.list && \
  echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa/ubuntu bionic main">> /etc/apt/sources.list.d/raspbins.list && \
+ if [ -z ${JELLYFIN_RELEASE+x} ]; then \
+	JELLYFIN="jellyfin"; \
+ else \
+	JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
+ fi && \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	at \
+	${JELLYFIN} \
 	jellyfin-ffmpeg \
+	jellyfin-server \
+	jellyfin-web \
 	libfontconfig1 \
 	libfreetype6 \
 	libomxil-bellagio0 \
 	libomxil-bellagio-bin \
 	libraspberrypi0 \
 	libssl1.0.0 && \
- echo "**** install jellyfin *****" && \
- if [ -z ${JELLYFIN_RELEASE+x} ]; then \
-	JELLYFIN="jellyfin-server-nightly jellyfin-web-nightly"; \
- else \
-	JELLYFIN="jellyfin-server-nightly=${JELLYFIN_RELEASE} jellyfin-web-nightly=${JELLYFIN_RELEASE}"; \
- fi && \
- apt-get install -y \
-	${JELLYFIN} && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \
diff --git a/Jenkinsfile b/Jenkinsfile
index 4d9928a..5f141ab 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -103,7 +103,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET https://repo.jellyfin.org/ubuntu/dists/bionic/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server-nightly' | awk -F ': ' '/Version/{print $2;exit}' ''',
+            script: ''' curl -sX GET https://repo.jellyfin.org/ubuntu/dists/bionic/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin' | awk -F ': ' '/Version/{print $2;exit}' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
diff --git a/README.md b/README.md
index c7c4286..61c43e4 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ This image provides various versions that are available via tags. `latest` tag u
 | Tag | Description |
 | :----: | --- |
 | latest | Stable Jellyfin releases |
-| nightly | Nightly Jellyfin releases |
+| nightly | Unstable Jellyfin releases |
 
 ## Usage
 
@@ -295,6 +295,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **22.07.20:** - Install nightly from unstable.
 * **27.05.20:** - Set web directory path.
 * **11.04.20:** - Enable hw decode (mmal) on Raspberry Pi, update readme instructions, add donation info, create missing default transcodes folder.
 * **11.03.20:** - Add v4l2 support on Raspberry Pi; remove optional transcode mapping (location is selected in the gui, defaults to path under `/config`).
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 762de46..ad52b0f 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-jellyfin
 external_type: na
-custom_version_command: "curl -sX GET https://repo.jellyfin.org/ubuntu/dists/bionic/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server-nightly' | awk -F ': ' '/Version/{print $2;exit}'"
+custom_version_command: "curl -sX GET https://repo.jellyfin.org/ubuntu/dists/bionic/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin' | awk -F ': ' '/Version/{print $2;exit}'"
 release_type: prerelease
 release_tag: nightly
 ls_branch: nightly
diff --git a/readme-vars.yml b/readme-vars.yml
index 41a4c3d..d8f1c22 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -17,7 +17,7 @@ available_architectures:
 development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable Jellyfin releases" }
-  - { tag: "nightly", desc: "Nightly Jellyfin releases" }
+  - { tag: "nightly", desc: "Unstable Jellyfin releases" }
 
 # container parameters
 common_param_env_vars_enabled: true #PGID, PUID, etc
@@ -99,6 +99,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "22.07.20:", desc: "Install nightly from unstable." }
   - { date: "27.05.20:", desc: "Set web directory path." }
   - { date: "11.04.20:", desc: "Enable hw decode (mmal) on Raspberry Pi, update readme instructions, add donation info, create missing default transcodes folder." }
   - { date: "11.03.20:", desc: "Add v4l2 support on Raspberry Pi; remove optional transcode mapping (location is selected in the gui, defaults to path under `/config`)." }