diff --git a/Dockerfile b/Dockerfile
index e4e0412..d711db5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,7 @@ MAINTAINER sparklyballs
 
 # set environment variables
 ARG DEBIAN_FRONTEND="noninteractive"
+ENV XDG_CONFIG_HOME="/config/xdg"
 
 # add sonarr repository
 RUN \
@@ -18,7 +19,7 @@ RUN \
 
 # cleanup
  apt-get clean && \
- rm -rfv \
+ rm -rf \
 	/tmp/* \
 	/var/lib/apt/lists/* \
 	/var/tmp/*
@@ -27,5 +28,5 @@ RUN \
 COPY root/ /
 
 # ports and volumes
-VOLUME /config /downloads /tv
 EXPOSE 8989
+VOLUME /config /downloads /tv
diff --git a/README.md b/README.md
index b926748..7248549 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,8 @@ Access the webui at `<your-ip>:8989`, for more information check out [Sonarr](ht
 
 ## Changelog
 
++ **23.09.16:** Add cd to /opt fixes redirects with althub (issue #25)
+, make XDG config environment variable
 + **15.09.16:** Add libcurl3 package.
 + **09.09.16:** Add layer badges to README.
 + **27.08.16:** Add badges to README.
diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
index e7ae5bb..7a279d1 100644
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -1,8 +1,9 @@
 #!/usr/bin/with-contenv bash
 
 # cleanup pid if it exists
-[[ -e /config/nzbdrone.pid ]] && rm -rf /config/nzbdrone.pid
+[[ -e /config/nzbdrone.pid ]] && \
+	rm -rf /config/nzbdrone.pid
 
 # permissions
-chown -R abc:abc /opt/NzbDrone
-
+chown -R abc:abc \
+	/opt/NzbDrone
diff --git a/root/etc/services.d/sonarr/run b/root/etc/services.d/sonarr/run
index 4b2d969..3e8e116 100644
--- a/root/etc/services.d/sonarr/run
+++ b/root/etc/services.d/sonarr/run
@@ -2,4 +2,8 @@
 
 umask 0002
 
-XDG_CONFIG_HOME="/config/xdg" exec s6-setuidgid abc mono /opt/NzbDrone/NzbDrone.exe -nobrowser -data=/config
+cd /opt/NzbDrone
+
+exec \
+	s6-setuidgid abc mono NzbDrone.exe \
+	-nobrowser -data=/config