diff --git a/roles/apps/templates/clightning/clightning-node.container.j2 b/roles/apps/templates/clightning/clightning-node.container.j2
index b0bd0c2..6afaa88 100644
--- a/roles/apps/templates/clightning/clightning-node.container.j2
+++ b/roles/apps/templates/clightning/clightning-node.container.j2
@@ -4,7 +4,7 @@ Description=Core Lightning Server
 [Container]
 Image={{ registry_url }}/clightning:{{ clightning_version }}
 PodmanArgs=--pod bitcoin-pod
-Exec=--bitcoin-rpcuser={{bitcoin_rpcuser}} --bitcoin-rpcpassword={{bitcoin_rpcpassword}} --clnrest-port=3001 --clnrest-host=0.0.0.0 --clnrest-certs=/root/.lightning
+Exec=--pid-file=/root/.lightning/lightning.pid --bitcoin-rpcuser={{bitcoin_rpcuser}} --bitcoin-rpcpassword={{bitcoin_rpcpassword}} --clnrest-port=3001 --clnrest-host=0.0.0.0 --clnrest-certs=/root/.lightning
 
 # Use volume 
 Volume=/home/{{ansible_user}}/vol/bitcoin/.bitcoin:/data/.bitcoin:ro,Z
diff --git a/roles/apps/templates/lnbits/Containerfile.j2 b/roles/apps/templates/lnbits/Containerfile.j2
index 61fdae2..3aefc1e 100644
--- a/roles/apps/templates/lnbits/Containerfile.j2
+++ b/roles/apps/templates/lnbits/Containerfile.j2
@@ -35,4 +35,4 @@ ENV LNBITS_HOST="0.0.0.0"
 
 EXPOSE $LNBITS_PORT
 
-CMD ["sh", "-c", "poetry run lnbits --port $LNBITS_PORT --host $LNBITS_HOST"]
+CMD ["sh", "-c", "poetry install && poetry run lnbits --port $LNBITS_PORT --host $LNBITS_HOST"]