diff --git a/cmd/nigiri/resources/docker-compose.yml b/cmd/nigiri/resources/docker-compose.yml
index 9da3027..21f2a5d 100644
--- a/cmd/nigiri/resources/docker-compose.yml
+++ b/cmd/nigiri/resources/docker-compose.yml
@@ -167,7 +167,7 @@ services:
 
   lnd:
     container_name: lnd
-    image: lightninglabs/lnd:v0.14.3-beta
+    image: lightninglabs/lnd:v0.15.0-beta
     user: 1000:1000
     depends_on:
       - bitcoin
@@ -179,9 +179,10 @@ services:
     stop_grace_period: 5m30s
     ports:
       - "9735:9735" # p2p
-      - "10009:10009" # grpc
+      - "10009:10009" # grpc"
+      - "18080:18080" # rest"
 
-  lightningd:
+  cln:
     container_name: cln
     image: elementsproject/lightningd:latest
     environment:
diff --git a/cmd/nigiri/resources/lnd.conf b/cmd/nigiri/resources/lnd.conf
index babb9b4..8aa5b00 100644
--- a/cmd/nigiri/resources/lnd.conf
+++ b/cmd/nigiri/resources/lnd.conf
@@ -1,7 +1,13 @@
 [Application Options]
+alias=nigiri
 debuglevel=debug
 noseedbackup=1
 
+# RPC open to all connections on Port 10009
+rpclisten=0.0.0.0:10009
+# REST open to all connections on Port 18080
+restlisten=0.0.0.0:18080
+
 
 [Bitcoin]
 ; If the Bitcoin chain should be active. Atm, only a single chain can be
diff --git a/cmd/nigiri/start.go b/cmd/nigiri/start.go
index 1eff8b9..706eb25 100644
--- a/cmd/nigiri/start.go
+++ b/cmd/nigiri/start.go
@@ -52,7 +52,7 @@ func startAction(ctx *cli.Context) error {
 		// LND
 		servicesToRun = append(servicesToRun, "lnd")
 		// Core Lightning Network
-		servicesToRun = append(servicesToRun, "lightningd")
+		servicesToRun = append(servicesToRun, "cln")
 	}
 
 	if isCI {
@@ -67,7 +67,7 @@ func startAction(ctx *cli.Context) error {
 			// LND
 			servicesToRun = append(servicesToRun, "lnd")
 			// Core Lightning Network
-			servicesToRun = append(servicesToRun, "lightningd")
+			servicesToRun = append(servicesToRun, "cln")
 		}
 	}