diff --git a/docker-compose.yml b/docker-compose.yml
index 44adf8c..dc7ca3d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,9 @@
 version: "3"
 services:
-  apostol-dm:
+  bitdeals:
+    build:
+      context: docker
+      dockerfile: Dockerfile
     image: bitdeals/apostol-dm
     environment:
       - DM_FORWEB=http://127.0.0.1
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3168321..5d3fd17 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -112,6 +112,7 @@ COPY --from=development --chown=www-data:www-data $UHOME/web-build/build /var/ww
 COPY --from=development --chown=$UNAME:$UNAME $UHOME/apostol-dm/docker/bitdeals-testnet.asc /etc/dm/bitdeals-testnet.asc
 COPY --from=development --chown=$UNAME:$UNAME $UHOME/apostol-dm/docker/bitdeals.asc /etc/dm/bitdeals.asc
 COPY --from=development $UHOME/apostol-dm/docker/run.sh /run.sh
+COPY --from=development $UHOME/apostol-dm/docker/dm /opt
 COPY nginx.conf /etc/nginx/sites-enabled/default
 
 ## Generate bx testnet config
diff --git a/docker/bitdeals-testnet.asc b/docker/bitdeals-testnet.asc
index 9e7b21b..b54b7cf 100644
--- a/docker/bitdeals-testnet.asc
+++ b/docker/bitdeals-testnet.asc
@@ -1,56 +1,134 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mI0EXgvhAAEEAND2+o1erJQ0nZo3CygW5iqTG7DZHvK0jBysPAk5KEKJld5+wIxZ
-zTkukczM2iJ2aprqr4+v2owQ2FNmUgFUsOA/hdLFDsNXdpdvuiwe0fTRFeV9nNOB
-n6P1HowrfQLOaTScvpRy4ofe9Tp4ym/Vpm46DGgZcw1j7CFxSlITRnFrABEBAAG0
-UUJpdGNvaW5fa2V5MiAoMDJkN2Y3ZWE1YmVkZmMyMjlkNzg5ZWNkNWFhYjc2NmZj
-YjllZTY5OTdhYmVmZTEzNGU3NDJiYzM5YzdkMmEyMGY2KYjOBBMBAgA4FiEELD0e
-1FyzQjWnqlGAbV80KhwzZ5AFAl4L4QACGwMFCwkIBwIGFQoJCAsCBBYCAwECHgEC
-F4AACgkQbV80KhwzZ5BYEQQAvJD1W9EtaSINrAE7ZLRDz0AsY/SNBeLom5715Ij/
-qp3CN4ASm8i4uBScyi6li4GXWSFQEYcyxvwljKLlAxxEdEuvggXSYq6B9aZFCtsj
-fX0N4SuhCNA+IjAosMFCrgrYsPUO4TdMka0GqTk2BnGKQI7dtqnTTMHBA0q5T99L
-yo+0DUJpdERlYWxzLXRlc3SIzgQTAQIAOBYhBCw9HtRcs0I1p6pRgG1fNCocM2eQ
-BQJeC+EAAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEG1fNCocM2eQNE4E
-ALjFrjr6IvIZ5CXQzdpYVjSnYAJuL3kbmgUFVxz4yb0fmHTtjEEDa79jQ5Q+zmca
-qDEmka1dVFeaU3qY8JRbg2svqpxQMLCOMSrdO/5+rKHFfkjD/fCDtq/8Q1NCnGYb
-c3Ld/vLXLL8kzyHtWVeUs4AkpXs4r4TjIYRzdvXDjwt+tFFCaXRjb2luX2tleTEg
-KDAyNDUyZGRhZmNkYjkzNzkzYmI1MGE3OTdjNWQ1OGVkZjkwNzRhOWIxYTk4ZDU5
-NTFmYjZkYTg3MTk3ZDhkN2MyNCmIzgQTAQIAOBYhBCw9HtRcs0I1p6pRgG1fNCoc
-M2eQBQJeC+EAAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEG1fNCocM2eQ
-XawD/3EGWzl6RS9HuZmXLZ9FVu6Rm14SD8Y2Mbco2g6tO1+UMI+M1xAXMJjzEXdc
-KZVx/9kcIao/e9ZG8xmHwXmezdWNMrpbYJ/waoA4NfrHMUiEVCTyJUwMOVQB3eQG
-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
-=nkLW
+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
+X2tleTEgKDAyNDUyZGRhZmNkYjkzNzkzYmI1MGE3OTdjNWQ1OGVkZjkwNzRhOWIx
+YTk4ZDU5NTFmYjZkYTg3MTk3ZDhkN2MyNCmJAk4EEwECADgWIQTAYdM84M3yXRN4
+u9PaLIdkeIAGswUCXgvhAAIbAQULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRDa
+LIdkeIAGs+7pEACBIL1v9yCT3CtoeiUQeeHqey+cbqclF98nm2aUHSatK+F6SceZ
+mRuHulWCpyaytuEEV8rUmRi5MxCw2/lr3crMbu4B+KCRcS1oaaqRW5lqwHA5YmHd
+SkzgnW9iIVUVc8SrkyZ6s+1kjb/NRghOVT/+BQnHl5EK2wX8nJ2OkiVnUHSZPF26
+HOSF07AewhrerysZ1laEQkus5LfXP9jAg1XtJji3Kv1PkAWgtwraLG1PkeIa6X0i
+CQXqEpA9tbMyo5GAz3u1psEJgj3y5HPrfAiT0NwK4eyN7ufwlWjp3OexN/c+he//
+UVSzorcoVs9GSt/C6wAvyKM4uuLHboHr5dy8rlMo4soyFrDG/6sn9v7QQRzC8Y10
+KxEEsfPrt+jFXfzUH6BS8+70YW0ZtK1jA04hzqdyEdEBOb/UuvEF5IfYafPxnZye
+LMSZqD+Ppzhr5ZSow4PKIuQG//csl8UhpG3wFfcDRCb9SQsTzuWfk9qkFKXPLaMV
+zoKe2r5kojJKB11vHmobz00QZ6IntqITiJo3ck9mKvd7AbplSP3MwbUQd9CCvimf
+eak2qqUpKIQ2XFSgvo+KZm1r9oMzLZqrYaR5OuaNr7oabqolqnrI7azJKrLyA00m
+eyH79e5W88GL6zOvij85BE/iyJVxP4p4RfjEngIQxoHY9MtWlMcqUjLTsrREQk0t
+MmNYOHk5dTl5RWkzZmRxUWZuZHg5RjZOZFI1SHY3OWFkZCAoaHR0cHM6Ly90ZXN0
+bmV0LmJpdGRlYWxzLm9yZymJAk4EEwECADgWIQTAYdM84M3yXRN4u9PaLIdkeIAG
+swUCXgvhAAIbAQULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRDaLIdkeIAGs/j8
+D/9oYFb1ozYoH6PRkm6V5Ls+LxtN7TXNb60qXqzLUhmUKipwQk73ecxhHmEHoKlb
+d7eMNzDVGT+L+8OBU9mnZOuGHLQXa5oI/Bdgp60IxkwEYleoAz+gYwk+FdZGVsM5
+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
+=JyHG
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/docker/run.sh b/docker/run.sh
index 49f1057..1771800 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -135,7 +135,7 @@ generate_btc_key()
   B=$(tput bold ; tput setaf 1)
   N=$(tput sgr0)
 
-  if [ -z "$_DM_BITCOIN" ]
+  if [ -z "$_DM_BITCOIN" -a -z "$DM_BITCOIN" ]
   then
     ## Generate bitcoin key pair
     PRIVKEY="$(cat /dev/random | tr -cd "[:digit:]" | head -c 64)"