diff --git a/build/Dockerfile b/build/Dockerfile
index cefa307..30be44e 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,16 +1,5 @@
-FROM golang:1.15-alpine as builder
-
 ARG UPSTREAM_VERSION
 
-RUN apk add --no-cache make gcc musl-dev linux-headers git bash
-
-RUN git clone -b ${UPSTREAM_VERSION} https://github.com/ethereum/go-ethereum.git && \
-    cd go-ethereum && make geth
-
-# Pull Geth into a second stage deploy alpine container
-FROM alpine:edge
-
-RUN apk add --no-cache ca-certificates
-COPY --from=builder /go/go-ethereum/build/bin/geth /usr/local/bin
+FROM ethereum/client-go:${UPSTREAM_VERSION}
 
-ENTRYPOINT geth --ropsten --http --http.addr 0.0.0.0 --http.corsdomain "*" --http.vhosts "*" --ws --ws.origins "*" --ws.addr 0.0.0.0 $EXTRA_OPTIONS
+ENTRYPOINT geth --ropsten --http --http.addr 0.0.0.0 --http.corsdomain "*" --http.vhosts "*" --ws --ws.origins "*" --ws.addr 0.0.0.0 --syncmode ${SYNCMODE:-fast} --metrics --metrics.addr 0.0.0.0 $EXTRA_OPTIONS
diff --git a/dappnode_package.json b/dappnode_package.json
index 9ea2696..957fc64 100644
--- a/dappnode_package.json
+++ b/dappnode_package.json
@@ -1,7 +1,7 @@
 {
   "name": "ropsten.dnp.dappnode.eth",
   "version": "0.3.5",
-  "upstreamVersion": "v1.10.7",
+  "upstreamVersion": "v1.10.8",
   "upstreamRepo": "ethereum/go-ethereum",
   "upstreamArg": "UPSTREAM_VERSION",
   "shortDescription": "Ethereum testnet with PoW - closest to Mainnet",
diff --git a/docker-compose.yml b/docker-compose.yml
index 51a3e9c..dcc6dc4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: ./build
       args:
-        UPSTREAM_VERSION: v1.10.7
+        UPSTREAM_VERSION: v1.10.8
     volumes:
       - "ropsten:/root/.ethereum/"
     ports:
@@ -15,5 +15,6 @@ services:
     restart: always
     environment:
       - "EXTRA_OPTIONS=--http.api eth,net,web3,txpool"
+      - SYNCMODE
 volumes:
   ropsten: {}