diff --git a/Dockerfile b/Dockerfile
index 1c7a999..0a9cd08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ WORKDIR /mautrixtelegram
 
 RUN virtualenv -p /usr/bin/python3 . \
  && source ./bin/activate \
- && pip install --upgrade https://github.com/tulir/mautrix-telegram/tarball/master#egg=mautrix_telegram[all]
+ && pip install --upgrade https://github.com/jcgruenhage/mautrix-telegram/tarball/master#egg=mautrix_telegram[all]
 
 COPY root /
 
diff --git a/root/etc/s6.d/mautrix-telegram/run b/root/etc/s6.d/mautrix-telegram/run
index fc32735..fecff23 100755
--- a/root/etc/s6.d/mautrix-telegram/run
+++ b/root/etc/s6.d/mautrix-telegram/run
@@ -12,13 +12,13 @@ source ./bin/activate
 
 # Replace database path in alembic.ini
 sed -i "s#sqlite:///mautrix-telegram.db#sqlite:////data/mautrix-telegram.db#" alembic.ini
+sed -i "s#sqlite:///mautrix-telegram.db#sqlite:////data/mautrix-telegram.db#" /data/config.yaml
 
 # Check that database is in the right state
 alembic upgrade head
 
 if [[ ! -f /data/config.yaml ]]; then
 	cp example-config.yaml /data/config.yaml
-	sed -i "s#sqlite:///mautrix-telegram.db#sqlite:////data/mautrix-telegram.db#" /data/config.yaml
 	echo "Didn't find a config file."
 	echo "Copied default config file to /data/config.yaml"
 	echo "Modify that config file to your liking."