diff --git a/build/Dockerfile b/build/Dockerfile
index c7840dc..82aac97 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,6 +1,7 @@
 ### Build stage
 FROM golang:alpine3.9 AS build-env
-ENV VERSION v2.2.1
+ARG UPSTREAM_VERSION=v2.2.1
+ENV VERSION ${UPSTREAM_VERSION}
 # Install build deps
 RUN apk update && apk --no-cache add git gcc build-base
 # Get the source code
diff --git a/dappnode_package.json b/dappnode_package.json
index c9ef3c1..48d99ba 100644
--- a/dappnode_package.json
+++ b/dappnode_package.json
@@ -1,7 +1,13 @@
 {
   "name": "vipnode.dnp.dappnode.eth",
   "version": "0.1.0",
-  "upstreamVersion": "2.2.1",
+  "upstream": [
+    {
+      "repo": "vipnode/vipnode",
+      "version": "v2.2.1",
+      "arg": "UPSTREAM_VERSION"
+    }
+  ],
   "shortDescription": "Economic incentive for running Ethereum full nodes",
   "description": "[Vipnode](https://vipnode.org)'s goal is to allow the Ethereum network to remain decentralized by creating a financial marketplace for more people to run full nodes and serve native light clients. Check this [medium article](https://medium.com/vipnode/an-economic-incentive-for-running-ethereum-full-nodes-ecc0c9ebe22) to understand the motivation behind this project and this [2.0 release article](https://medium.com/vipnode/vipnode-2-0-released-9af1d65b4552) for a tutorial on how to use Vipnode.",
   "avatar": "/ipfs/QmSVNvnnq1Wg5aXT7fxWHQbLbR1aqccGUJsCWjNVT7qtFL",
diff --git a/docker-compose.yml b/docker-compose.yml
index 5d9c5af..dfc2c15 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,4 +2,7 @@ version: '3.4'
 services:
   vipnode.dnp.dappnode.eth:
     image: 'vipnode.dnp.dappnode.eth:0.1.0'
-    build: ./build
+    build:
+      context: ./build
+      args:
+        UPSTREAM_VERSION: v2.2.1