diff --git a/irssi/Dockerfile b/irssi/Dockerfile
index 25a9a19..7465525 100644
--- a/irssi/Dockerfile
+++ b/irssi/Dockerfile
@@ -43,8 +43,8 @@ RUN buildDeps=' \
 	&& set -x \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/* \
-	&& curl -sSL "http://www.irssi.org/files/irssi-${IRSSI_VERSION}.tar.bz2" -o /tmp/irssi.tar.bz2 \
-	&& curl -sSL "http://www.irssi.org/files/irssi-${IRSSI_VERSION}.tar.bz2.sig" -o /tmp/irssi.tar.bz2.sig \
+	&& curl -fsSL "https://github.com/irssi-import/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.bz2" -o /tmp/irssi.tar.bz2 \
+	&& curl -fsSL "https://github.com/irssi-import/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.bz2.sig" -o /tmp/irssi.tar.bz2.sig \
 	&& gpg --verify /tmp/irssi.tar.bz2.sig \
 	&& mkdir -p /usr/src/irssi \
 	&& tar -xjf /tmp/irssi.tar.bz2 -C /usr/src/irssi --strip-components 1 \
@@ -81,7 +81,6 @@ RUN buildDeps=' \
 	&& apt-get purge -y --auto-remove $buildDeps
 
 WORKDIR $HOME
-VOLUME $HOME/.irssi
 
 USER user
 CMD ["irssi"]
diff --git a/notify-osd/Dockerfile b/notify-osd/Dockerfile
index 14348ac..84226c5 100644
--- a/notify-osd/Dockerfile
+++ b/notify-osd/Dockerfile
@@ -1,6 +1,6 @@
 # To use:
 # Needs X11 socket and dbus mounted
-# 
+#
 # docker run -d \
 #	-v /etc/machine-id:/etc/machine-id:ro \
 #	-v /etc/localtime:/etc/localtime:ro \
@@ -23,6 +23,7 @@ MAINTAINER Jessie Frazelle <jess@linux.com>
 RUN apt-get update && apt-get install -y \
 	at-spi2-core \
 	dbus \
+	dbus-x11 \
 	libgl1-mesa-dri \
 	libgl1-mesa-glx \
 	libnotify-bin \
@@ -30,6 +31,15 @@ RUN apt-get update && apt-get install -y \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
+ENV HOME /home/user
+RUN useradd --create-home --home-dir $HOME user \
+	&& mkdir -p $HOME/.cache/dconf \
+	&& mkdir -p $HOME/.dbus \
+	&& chown -R user:user $HOME
+
 COPY org.freedesktop.Notifications.service /usr/share/dbus-1/services/org.freedesktop.Notifications.service
 
+WORKDIR $HOME
+
+USER user
 ENTRYPOINT ["/usr/lib/x86_64-linux-gnu/notify-osd"]