diff --git a/Dockerfile b/Dockerfile
index e94e428f..fa7b9c45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,8 +25,6 @@ RUN \
  echo "**** install runtime packages ****" && \
  apt-get update && \
  apt-get install -y \
-	avahi-daemon \
-	dbus \
 	udev \
 	unrar \
 	wget \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 4120d7bc..6c97e3c0 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -22,8 +22,6 @@ RUN \
  echo "**** install runtime packages ****" && \
  apt-get update && \
  apt-get install -y \
-	avahi-daemon \
-	dbus \
 	udev \
 	unrar \
 	wget \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 70e8e1fd..b2ff4441 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -22,8 +22,6 @@ RUN \
  echo "**** install runtime packages ****" && \
  apt-get update && \
  apt-get install -y \
-	avahi-daemon \
-	dbus \
 	udev \
 	unrar \
 	wget \
diff --git a/README.md b/README.md
index 551f5dd4..4cee4fba 100644
--- a/README.md
+++ b/README.md
@@ -188,12 +188,12 @@ We automatically add the necessary environment variables that will use all avail
 
 ## Versions
 
-* **16.01.19:** - Add pipeline logic, multi arch, and HW transcoding configuration.
+* **16.01.19:** - Add pipeline logic, multi arch, and HW transcoding configuration; remove avahi service.
 * **07.09.18:** - Rebase to ubuntu bionic, add udev package.
 * **09.12.17:** - Fix continuation lines.
 * **12.07.17:** - Add inspect commands to README, move to jenkins build and push.
 * **28.05.17:** - Add unrar package as per requests, for subzero plugin.
-* **11.01.17:** - Use Plex environemt variables from pms docker, change abc home folder to /app to alleviate usermod chowning library
+* **11.01.17:** - Use Plex environment variables from pms docker, change abc home folder to /app to alleviate usermod chowning library
 * **03.01.17:** - Use case insensitive version variable matching rather than export and make lowercase.
 * **17.10.16:** - Allow use of uppercase version variable
 * **01.10.16:** - Add TZ info to README.
@@ -208,4 +208,4 @@ We automatically add the necessary environment variables that will use all avail
 * **18.07.15:** - Moved autoupdate to be hosted by linuxserver.io and implemented bugfix thanks to ljm42.
 * **09.07.15:** - Now with ability to pick static version number.
 * **08.07.15:** - Now with autoupdates. (Hosted by fanart.tv)
-* **03.07.15:** - Fixed a mistake that allowed plex to run as user plex rather than abc (99:100). Thanks to double16 for spotting this.
\ No newline at end of file
+* **03.07.15:** - Fixed a mistake that allowed plex to run as user plex rather than abc (99:100). Thanks to double16 for spotting this.
diff --git a/readme-vars.yml b/readme-vars.yml
index e7cfe0af..21dbaf7b 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -83,12 +83,12 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "16.01.19:", desc: "Add pipeline logic, multi arch, and HW transcoding configuration." }
+  - { date: "16.01.19:", desc: "Add pipeline logic, multi arch, and HW transcoding configuration; remove avahi service." }
   - { date: "07.09.18:", desc: "Rebase to ubuntu bionic, add udev package." }
   - { date: "09.12.17:", desc: "Fix continuation lines." }
   - { date: "12.07.17:", desc: "Add inspect commands to README, move to jenkins build and push." }
   - { date: "28.05.17:", desc: "Add unrar package as per requests, for subzero plugin." }
-  - { date: "11.01.17:", desc: "Use Plex environemt variables from pms docker,
+  - { date: "11.01.17:", desc: "Use Plex environment variables from pms docker,
   change abc home folder to /app to alleviate usermod chowning library" }
   - { date: "03.01.17:", desc: "Use case insensitive version variable matching rather than export and make lowercase." }
   - { date: "17.10.16:", desc: "Allow use of uppercase version variable" }
diff --git a/root/etc/cont-init.d/30-dbus b/root/etc/cont-init.d/30-dbus
deleted file mode 100644
index 162daa1b..00000000
--- a/root/etc/cont-init.d/30-dbus
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# make folders
-mkdir -p \
-	/var/run/dbus
-
-# delete existing pid if found
-[[ -e /var/run/dbus/pid ]] && \
-	rm -f /var/run/dbus/pid
-
-# permissions
-chown messagebus:messagebus \
-	/var/run/dbus
-dbus-uuidgen --ensure
-sleep 1
diff --git a/root/etc/cont-init.d/60-plex-update b/root/etc/cont-init.d/60-plex-update
index 43b8d55f..8d4c507c 100755
--- a/root/etc/cont-init.d/60-plex-update
+++ b/root/etc/cont-init.d/60-plex-update
@@ -110,8 +110,13 @@ fi
 
 echo "Atempting to upgrade to: $REMOTE_VERSION"
 rm -f /tmp/plexmediaserver_*.deb
+if [[ $REMOTE_VERSION == 1.15* ]]; then
+wget -nv -P /tmp \
+"https://downloads.plex.tv/plex-media-server-new/$REMOTE_VERSION/debian/plexmediaserver_${REMOTE_VERSION}_amd64.deb"
+else
 wget -nv -P /tmp \
 "${PLEX_DOWNLOAD}/$REMOTE_VERSION/plexmediaserver_${REMOTE_VERSION}_amd64.deb"
+fi
 last=$?
 
 # test if deb file size is ok, or if download failed
diff --git a/root/etc/services.d/avahi/run b/root/etc/services.d/avahi/run
deleted file mode 100644
index e438886b..00000000
--- a/root/etc/services.d/avahi/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-until [[ -e /var/run/dbus/system_bus_socket ]]; do
-sleep 1s
-done
-
-echo "Starting Avahi daemon"
-exec avahi-daemon --no-chroot
diff --git a/root/etc/services.d/dbus/run b/root/etc/services.d/dbus/run
deleted file mode 100644
index 8f81ef1a..00000000
--- a/root/etc/services.d/dbus/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-echo "Starting dbus-daemon"
-exec dbus-daemon --system --nofork