diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.conffiles b/contrib/backends/bitcoin/debian/bitcoin-btc.conffiles
index 186137f2..d18f88ce 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-btc.conffiles
+++ b/contrib/backends/bitcoin/debian/bitcoin-btc.conffiles
@@ -1 +1 @@
-/data/btc/bitcoin/btc.conf
+/opt/bitcoin/btc/btc.conf
diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.install b/contrib/backends/bitcoin/debian/bitcoin-btc.install
index 4d959fa5..fe2df203 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-btc.install
+++ b/contrib/backends/bitcoin/debian/bitcoin-btc.install
@@ -1 +1,2 @@
-btc.conf /data/btc/bitcoin
+bitcoin/* /opt/bitcoin/btc
+btc.conf /opt/bitcoin/btc
diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.service b/contrib/backends/bitcoin/debian/bitcoin-btc.service
index a8011f6e..25f02d8e 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-btc.service
+++ b/contrib/backends/bitcoin/debian/bitcoin-btc.service
@@ -5,14 +5,14 @@
 # See "man systemd.service" for details.
 
 # Note that almost all daemon options could be specified in
-# /data/btc/bitcoin/bitcoin.conf
+# /opt/bitcoin/btc/btc.conf
 
 [Unit]
 Description=Bitcoin daemon (mainnet)
 After=network.target
 
 [Service]
-ExecStart=/opt/satoshilabs/bitcoin/bin/bitcoind -datadir=/data/btc/bitcoin -conf=/data/btc/bitcoin/btc.conf -pid=/run/bitcoind/btc.pid
+ExecStart=/opt/bitcoin/btc/bin/bitcoind -datadir=/data/btc/bitcoin -conf=/opt/bitcoin/btc/btc.conf -pid=/run/bitcoind/btc.pid
 # Creates /run/bitcoind owned by bitcoin
 RuntimeDirectory=bitcoind
 User=bitcoin
diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles b/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles
index 773374c9..2f410641 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles
+++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles
@@ -1 +1 @@
-/data/btc-testnet/bitcoin/btc-testnet.conf
+/opt/bitcoin/btc-testnet/btc-testnet.conf
diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.install b/contrib/backends/bitcoin/debian/bitcoin-testnet.install
index f86f4a4b..a9124874 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-testnet.install
+++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.install
@@ -1 +1,2 @@
-btc-testnet.conf /data/btc-testnet/bitcoin
+bitcoin/* /opt/bitcoin/btc-testnet
+btc-testnet.conf /opt/bitcoin/btc-testnet
diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.service b/contrib/backends/bitcoin/debian/bitcoin-testnet.service
index 0f4080b2..431fe84d 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-testnet.service
+++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.service
@@ -5,14 +5,14 @@
 # See "man systemd.service" for details.
 
 # Note that almost all daemon options could be specified in
-# /data/btc-testnet/bitcoin/bitcoin.conf
+# /opt/bitcoin/btc-testnet/btc-testnet.conf
 
 [Unit]
 Description=Bitcoin daemon (testnet)
 After=network.target
 
 [Service]
-ExecStart=/opt/satoshilabs/bitcoin/bin/bitcoind -datadir=/data/btc-testnet/bitcoin -conf=/data/btc-testnet/bitcoin/btc-testnet.conf -pid=/run/bitcoind/testnet.pid
+ExecStart=/opt/bitcoin/btc-testnet/bin/bitcoind -datadir=/data/btc-testnet/bitcoin -conf=/opt/bitcoin/btc-testnet/btc-testnet.conf -pid=/run/bitcoind/testnet.pid
 # Creates /run/bitcoind owned by bitcoin
 RuntimeDirectory=bitcoind
 User=bitcoin
diff --git a/contrib/backends/bitcoin/debian/bitcoin.install b/contrib/backends/bitcoin/debian/bitcoin.install
deleted file mode 100644
index 204eafa1..00000000
--- a/contrib/backends/bitcoin/debian/bitcoin.install
+++ /dev/null
@@ -1 +0,0 @@
-bitcoin /opt/satoshilabs
diff --git a/contrib/backends/bitcoin/debian/bitcoin.links b/contrib/backends/bitcoin/debian/bitcoin.links
deleted file mode 100644
index a8af3c05..00000000
--- a/contrib/backends/bitcoin/debian/bitcoin.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/opt/satoshilabs/bitcoin/bin/bitcoind /usr/bin/bitcoind
-/opt/satoshilabs/bitcoin/bin/bitcoin-cli /usr/bin/bitcoin-cli
diff --git a/contrib/backends/bitcoin/debian/control b/contrib/backends/bitcoin/debian/control
index d1f7f143..b53f5d77 100644
--- a/contrib/backends/bitcoin/debian/control
+++ b/contrib/backends/bitcoin/debian/control
@@ -2,20 +2,15 @@ Source: bitcoin
 Section: satoshilabs
 Priority: optional
 Maintainer: jakub.matys@satoshilabs.com
-Build-Depends: debhelper, wget, tar, gzip, make, dh-systemd
+Build-Depends: debhelper, wget, tar, gzip, make, dh-systemd, dh-exec
 Standards-Version: 3.9.5
 
-Package: bitcoin
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Satoshilabs packaged bitcoin server (binaries)
-
 Package: bitcoin-btc
-Architecture: all
-Depends: bitcoin (= ${binary:Version}), logrotate
-Description: Satoshilabs packaged bitcoin server (configuration)
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate
+Description: Satoshilabs packaged bitcoin server
 
 Package: bitcoin-testnet
-Architecture: all
-Depends: bitcoin (= ${binary:Version}), logrotate
-Description: Satoshilabs packaged bitcoin server (configuration)
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate
+Description: Satoshilabs packaged bitcoin server
diff --git a/contrib/backends/zcash/debian/control b/contrib/backends/zcash/debian/control
index 1352372f..1f6e861c 100644
--- a/contrib/backends/zcash/debian/control
+++ b/contrib/backends/zcash/debian/control
@@ -2,15 +2,10 @@ Source: zcash
 Section: satoshilabs
 Priority: optional
 Maintainer: jakub.matys@satoshilabs.com
-Build-Depends: debhelper, wget, tar, gzip, make, dh-systemd
+Build-Depends: debhelper, wget, tar, gzip, make, dh-systemd, dh-exec
 Standards-Version: 3.9.5
 
-Package: zcash
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Satoshilabs packaged zcash server (binaries)
-
 Package: zcash-zec
-Architecture: all
-Depends: zcash (= ${binary:Version}), logrotate
-Description: Satoshilabs packaged zcash server (configuration)
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate
+Description: Satoshilabs packaged zcash server
diff --git a/contrib/backends/zcash/debian/zcash-zec.conffiles b/contrib/backends/zcash/debian/zcash-zec.conffiles
index e8d03862..b67eba29 100644
--- a/contrib/backends/zcash/debian/zcash-zec.conffiles
+++ b/contrib/backends/zcash/debian/zcash-zec.conffiles
@@ -1 +1 @@
-/data/zec/zcash/zec.conf
+/opt/zcash/zec/zec.conf
diff --git a/contrib/backends/zcash/debian/zcash-zec.install b/contrib/backends/zcash/debian/zcash-zec.install
index 60fa4360..0bdf2442 100644
--- a/contrib/backends/zcash/debian/zcash-zec.install
+++ b/contrib/backends/zcash/debian/zcash-zec.install
@@ -1 +1,2 @@
-zec.conf /data/zec/zcash
+zcash/* /opt/zcash/zec
+zec.conf /opt/zcash/zec
diff --git a/contrib/backends/zcash/debian/zcash-zec.postinst b/contrib/backends/zcash/debian/zcash-zec.postinst
index 144fec21..4ca85d19 100644
--- a/contrib/backends/zcash/debian/zcash-zec.postinst
+++ b/contrib/backends/zcash/debian/zcash-zec.postinst
@@ -14,7 +14,7 @@ case "$1" in
         chown zcash:zcash /data/zec/zcash
     fi
 
-    HOME=/data/zec/zcash /opt/satoshilabs/zcash/bin/zcash-fetch-params
+    HOME=/data/zec/zcash /opt/zcash/zec/bin/zcash-fetch-params
   ;;
 
 esac
diff --git a/contrib/backends/zcash/debian/zcash-zec.service b/contrib/backends/zcash/debian/zcash-zec.service
index 6eb81110..a232480d 100644
--- a/contrib/backends/zcash/debian/zcash-zec.service
+++ b/contrib/backends/zcash/debian/zcash-zec.service
@@ -5,14 +5,15 @@
 # See "man systemd.service" for details.
 
 # Note that almost all daemon options could be specified in
-# /data/zec/zcash/zcash.conf
+# /opt/zcash/zec/zec.conf
 
 [Unit]
 Description=ZCash daemon (mainnet)
 After=network.target
 
 [Service]
-ExecStart=/opt/satoshilabs/zcash/bin/zcashd -datadir=/data/zec/zcash -conf=/data/zec/zcash/zec.conf -pid=/run/zcashd/zec.pid
+Environment="HOME=/data/zec/zcash"
+ExecStart=/opt/zcash/zec/bin/zcashd -datadir=/data/zec/zcash -conf=/opt/zcash/zec/zec.conf -pid=/run/zcashd/zec.pid
 # Creates /run/zcashd owned by zcash
 RuntimeDirectory=zcashd
 User=zcash
@@ -38,7 +39,7 @@ NoNewPrivileges=true
 PrivateDevices=true
 
 # Deny the creation of writable and executable memory mappings.
-MemoryDenyWriteExecute=true
+# MemoryDenyWriteExecute=true
 
 [Install]
 WantedBy=multi-user.target
diff --git a/contrib/backends/zcash/debian/zcash.install b/contrib/backends/zcash/debian/zcash.install
deleted file mode 100644
index f1f0f6bc..00000000
--- a/contrib/backends/zcash/debian/zcash.install
+++ /dev/null
@@ -1 +0,0 @@
-zcash /opt/satoshilabs
diff --git a/contrib/backends/zcash/debian/zcash.links b/contrib/backends/zcash/debian/zcash.links
deleted file mode 100644
index 9a1efd8d..00000000
--- a/contrib/backends/zcash/debian/zcash.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/opt/satoshilabs/zcash/bin/zcashd /usr/bin/zcashd
-/opt/satoshilabs/zcash/bin/zcash-cli /usr/bin/zcash-cli