diff --git a/.env b/.env
new file mode 100644
index 0000000..e1207e2
--- /dev/null
+++ b/.env
@@ -0,0 +1,3 @@
+RELEASE=elements-0.18.1.1
+CHAIN=regtest
+DAEMON_RPC=18443
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..2a59c21
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM ubuntu:18.04
+ARG release=elements-0.18.1.1
+ARG chain=liquidregtest
+
+RUN apt-get update && apt-get install -y \
+    wget && \
+    cd /opt && \
+    wget https://github.com/ElementsProject/elements/releases/download/$release/$release-x86_64-linux-gnu.tar.gz && \
+    tar zxvf $release-x86_64-linux-gnu.tar.gz && \
+    cd $release && \
+    ln -s /opt/$release/bin/elementsd /usr/bin/elementsd && \
+    ln -s /opt/$release/bin/elements-cli /usr/bin/elements-cli && \
+    echo "alias ecli=\"elements-cli -chain=$chain -rpcuser=elements -rpcpassword=elements\"" >> /root/.bashrc
diff --git a/docker-compose.yml b/docker-compose.yml
index fec8923..3fbb404 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,17 +11,20 @@ services:
     elementsd:
         container_name: 'elements'
         build:
-            context: ./elements.0.17.0
-            dockerfile: Dockerfile
+            context: .
+            args:
+                release: ${RELEASE}
+                chain: ${CHAIN}
         networks:
             app_net:
                 ipv4_address: 172.32.0.2
         ports:
             - "127.0.0.1:18444:18444"
             - "127.0.0.1:7040:7040"
+            - "127.0.0.1:18443:18443"
         command: >
             elementsd 
-            -chain=liquidregtest
+            -chain=${CHAIN}
             -debug
             -listenonion=0 
             -server=1 
@@ -49,7 +52,7 @@ services:
             -vvvv
             --timestamp
             --jsonrpc-import
-            --network liquidregtest
+            --network ${CHAIN}
             --cookie elements:elements
-            --daemon-rpc-addr 172.32.0.2:7040
+            --daemon-rpc-addr 172.32.0.2:${DAEMON_RPC}
             --http-addr 0.0.0.0:3002
diff --git a/elements.0.17.0/Dockerfile b/elements.0.17.0/Dockerfile
deleted file mode 100644
index 3c82faa..0000000
--- a/elements.0.17.0/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt-get update && apt-get install -y \
-    wget && \
-    cd /opt && \
-    wget https://github.com/ElementsProject/elements/releases/download/elements-0.17.0.2/elements-0.17.0.2-x86_64-linux-gnu.tar.gz && \
-    tar zxvf elements-0.17.0.2-x86_64-linux-gnu.tar.gz && \
-    cd elements-0.17.0 && \
-    ln -s /opt/elements-0.17.0/bin/elementsd /usr/bin/elementsd && \
-    ln -s /opt/elements-0.17.0/bin/elements-cli /usr/bin/elements-cli && \
-    sed -i -e '$a alias ecli="elements-cli -chain=liquidregtest -rpcuser=elements -rpcpassword=elements"' /root/.bashrc
-
diff --git a/elements.0.18.1/Dockerfile b/elements.0.18.1/Dockerfile
deleted file mode 100644
index 57be310..0000000
--- a/elements.0.18.1/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt-get update && apt-get install -y \
-    wget && \
-    cd /opt && \
-    wget https://github.com/ElementsProject/elements/releases/download/elements-0.18.1/elements-0.18.1-x86_64-linux-gnu.tar.gz && \
-    tar zxvf elements-0.18.1-x86_64-linux-gnu.tar.gz && \
-    cd elements-0.18.1 && \
-    ln -s /opt/elements-0.18.1/bin/elementsd /usr/bin/elementsd && \
-    ln -s /opt/elements-0.18.1/bin/elements-cli /usr/bin/elements-cli && \
-    sed -i -e '$a alias ecli="elements-cli -chain=liquidregtest -rpcuser=elements -rpcpassword=elements"' /root/.bashrc
-