diff --git a/Dockerfile b/Dockerfile
index f4825c1..f5de47d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /photon
-ADD http://photon.komoot.de/data/photon-0.2.7.jar /photon/photon.jar
+ADD https://github.com/komoot/photon/releases/download/0.3.1/photon-0.3.1.jar /photon/photon.jar
 COPY entrypoint.sh ./entrypoint.sh
 
 VOLUME /photon/photon_data
diff --git a/docker-compose.yml b/docker-compose.yml
index 47034ae..0ed137d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,11 @@
-version: '2'
+version: '3.4'
 services:
   photon:
     build:
+      network: host
       context: .
       dockerfile: Dockerfile
-    image: thomasnordquist/photon-geocoder:latest
+    image: jfelectron/geocoder
     volumes:
       - data:/photon/photon_data
     ports:
diff --git a/entrypoint.sh b/entrypoint.sh
index 77f8b10..57f7935 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -7,7 +7,7 @@ if [ ! -d "/photon/photon_data/elasticsearch" ]; then
 
     # Let graphhopper know where the traffic is coming from
     USER_AGENT="docker: thomasnordquist/photon-geocoder"
-    wget --user-agent="$USER_AGENT" -O - http://download1.graphhopper.com/public/photon-db-latest.tar.bz2 | bzip2 -cd | tar x
+    wget --user-agent="$USER_AGENT" -O - http://download1.graphhopper.com/public/photon-db-latest.tar.bz2 | pbzip2 -cd | tar x
 fi
 
 # Start photon if elastic index exists