diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 09431e5..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM python:3
-ENV APP_PATH=/srv/python-teos
-VOLUME ["~/.teos"]
-WORKDIR /srv
-RUN mkdir ~/.teos &&  git clone https://github.com/aljazceru/python-teos.git && cd python-teos &&  pip install -r requirements.txt && python generate_keys.py -d ~/.teos
-ENV PYTHONPATH=$APP_PATH
-WORKDIR /srv/python-teos 
-EXPOSE 9814/tcp
-ENTRYPOINT [ "/srv/python-teos/entrypoint.sh" ]
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..8b5e73a
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3
+ENV APP_PATH=/srv/python-teos
+VOLUME ["~/.teos"]
+WORKDIR /srv
+ADD . /srv/python-teos
+RUN mkdir ~/.teos && cd python-teos &&  pip install -r requirements.txt && python generate_keys.py -d ~/.teos
+ENV PYTHONPATH=$APP_PATH
+WORKDIR /srv/python-teos 
+EXPOSE 9814/tcp
+ENTRYPOINT [ "/srv/python-teos/docker/entrypoint.sh" ]
diff --git a/entrypoint.sh b/docker/entrypoint.sh
similarity index 52%
rename from entrypoint.sh
rename to docker/entrypoint.sh
index a82b8b1..7085097 100755
--- a/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -2,29 +2,32 @@
 
 START_COMMAND="/usr/local/bin/python3 -m teos.teosd "
 
-if [[ ! -z ${BTC_RPC_USER} ]]; then 
-    START_COMMAND=$START_COMMAND" --btcrpcuser=""$BTC_RPC_USER"
-fi
-
-if [[ ! -z ${BTC_RPC_HOST} ]]; then 
-    START_COMMAND=$START_COMMAND" --btcrpcconnect=""$BTC_RPC_HOST"
-fi
-
-if [[ ! -z ${BTC_RPC_PASSWD} ]]; then 
-    START_COMMAND=$START_COMMAND" --btcrpcpassword=""$BTC_RPC_PASSWD"
-fi
-
-if [[ ! -z ${BTC_NETWORK} ]]; then 
-    START_COMMAND=$START_COMMAND" --btcnetwork=""$BTC_NETWORK"
-fi
-
-if [[ ! -z ${API_CONNECT} ]]; then
-    START_COMMAND=$START_COMMAND" --apiconnect=""$API_CONNECT"
+if [[ ! -z ${API_BIND} ]]; then
+    START_COMMAND=$START_COMMAND" --apibind=""$API_BIND"
 fi
 
 if [[ ! -z ${API_PORT} ]]; then
     START_COMMAND=$START_COMMAND" --apiport=""$API_PORT"
 fi
 
+if [[ ! -z ${BTC_NETWORK} ]]; then
+    START_COMMAND=$START_COMMAND" --btcnetwork=""$BTC_NETWORK"
+fi
+
+if [[ ! -z ${BTC_RPC_USER} ]]; then 
+    START_COMMAND=$START_COMMAND" --btcrpcuser=""$BTC_RPC_USER"
+fi
+
+if [[ ! -z ${BTC_RPC_PASSWORD} ]]; then
+    START_COMMAND=$START_COMMAND" --btcrpcpassword=""$BTC_RPC_PASSWORD"
+fi
+
+if [[ ! -z ${BTC_RPC_CONNECT} ]]; then
+    START_COMMAND=$START_COMMAND" --btcrpcconnect=""$BTC_RPC_CONNECT"
+fi
+
+if [[ ! -z ${BTC_RPC_PORT} ]]; then
+    START_COMMAND=$START_COMMAND" --btcrpcport=""$BTC_RPC_PORT"
+fi
 
 $START_COMMAND