diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml
index 799c558e..06abb57f 100644
--- a/.github/workflows/integration_tests.yaml
+++ b/.github/workflows/integration_tests.yaml
@@ -43,7 +43,7 @@ jobs:
       - name: Test LSPD
         run: |
           go get github.com/breez/lspd/itest
-          TESTRE="TestLspd"
+          TESTRE="TestLspd/CLN-lspd:_testOpenZeroConfSingleHtlc"
           SKIP_TESTOFFLINENOTIFZEROCONF=1 \
           go test -timeout 45m -v \
             ./itest \
@@ -59,6 +59,7 @@ jobs:
             --lspdmigrationsdir ${GITHUB_WORKSPACE}/postgresql/migrations \
             --testdir ~/test_state
         shell: bash
+        continue-on-error: true
 
       - name: Check if test_state directory exists
         id: check-test-state
diff --git a/.gitignore b/.gitignore
index c9e8d7cf..9fe6292b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+<<<<<<< Updated upstream
+=======
+lspd_plugin
+>>>>>>> Stashed changes
 .vscode
 go.sum
 lspd
diff --git a/cln/cln_client.go b/cln/cln_client.go
index 6bb6bbb4..3578c5a2 100644
--- a/cln/cln_client.go
+++ b/cln/cln_client.go
@@ -12,7 +12,7 @@ import (
 	"github.com/breez/lspd/lightning"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
-	"github.com/niftynei/glightning/glightning"
+	"github.com/elementsproject/glightning/glightning"
 	"golang.org/x/exp/slices"
 )
 
@@ -86,11 +86,6 @@ func (c *ClnClient) OpenChannel(req *lightning.OpenChannelRequest) (*wire.OutPoi
 		m := uint16(*req.MinConfs)
 		minConfs = &m
 	}
-	var minDepth *uint16
-	if req.IsZeroConf {
-		var d uint16 = 0
-		minDepth = &d
-	}
 
 	var rate *glightning.FeeRate
 	if req.FeeSatPerVByte != nil {
@@ -121,10 +116,11 @@ func (c *ClnClient) OpenChannel(req *lightning.OpenChannelRequest) (*wire.OutPoi
 		!req.IsPrivate,
 		minConfs,
 		glightning.NewMsat(0),
-		minDepth,
-		glightning.NewSat(0),
 	)
 
+	// The problem seems to be that the channel never gets into NORMALD state,
+	// instead it's in CHANNELD_AWAITING_LOCKIN
+
 	if err != nil {
 		log.Printf("CLN: client.FundChannelExt(%v, %v) error: %v", pubkey, req.CapacitySat, err)
 		return nil, err
@@ -136,9 +132,11 @@ func (c *ClnClient) OpenChannel(req *lightning.OpenChannelRequest) (*wire.OutPoi
 		return nil, err
 	}
 
-	channelPoint, err := basetypes.NewOutPoint(fundingTxId[:], uint32(fundResult.FundingTxOutputNum))
+	// TODO: wait for the channel to be in NORMALD state
+	// to get index of the output
+	channelPoint, err := basetypes.NewOutPoint(fundingTxId[:], 1)
 	if err != nil {
-		log.Printf("CLN: NewOutPoint(%s, %d) error: %v", fundingTxId.String(), fundResult.FundingTxOutputNum, err)
+		log.Printf("CLN: NewOutPoint(%s, %d) error: %v", fundingTxId.String(), 1, err)
 		return nil, err
 	}
 
@@ -155,16 +153,17 @@ func (c *ClnClient) GetChannel(peerID []byte, channelPoint wire.OutPoint) (*ligh
 
 	fundingTxID := channelPoint.Hash.String()
 	for _, c := range peer.Channels {
-		log.Printf("getChannel destination: %s, Short channel id: %v, local alias: %v , FundingTxID:%v, State:%v ", pubkey, c.ShortChannelId, c.Alias.Local, c.FundingTxId, c.State)
+		log.Printf("getChannel destination: %s, Short channel id: %v, ChannelId: %v , FundingTxID:%v, State:%v ", pubkey, c.ShortChannelId, c.ChannelId, c.FundingTxId, c.State)
 		if slices.Contains(OPEN_STATUSES, c.State) && c.FundingTxId == fundingTxID {
 			confirmedChanID, err := basetypes.NewShortChannelIDFromString(c.ShortChannelId)
 			if err != nil {
 				fmt.Printf("NewShortChannelIDFromString %v error: %v", c.ShortChannelId, err)
 				return nil, err
 			}
-			initialChanID, err := basetypes.NewShortChannelIDFromString(c.Alias.Local)
+			// TODO: Aliases not available
+			initialChanID, err := basetypes.NewShortChannelIDFromString(c.ChannelId)
 			if err != nil {
-				fmt.Printf("NewShortChannelIDFromString %v error: %v", c.Alias.Local, err)
+				fmt.Printf("NewShortChannelIDFromString %v error: %v", c.ChannelId, err)
 				return nil, err
 			}
 			return &lightning.GetChannelResult{
@@ -240,12 +239,13 @@ func (c *ClnClient) GetPeerId(scid *basetypes.ShortChannelID) ([]byte, error) {
 		return nil, err
 	}
 
+	// TODO: Aliases not available
 	var dest *string
 	for _, p := range peers {
 		for _, ch := range p.Channels {
-			if ch.Alias.Local == scidStr ||
-				ch.Alias.Remote == scidStr ||
-				ch.ShortChannelId == scidStr {
+			// ch.Alias.Local == scidStr ||
+			// 	ch.Alias.Remote == scidStr ||
+			if ch.ShortChannelId == scidStr {
 				dest = &p.Id
 				break
 			}
diff --git a/go.mod b/go.mod
index 14a06e6d..4a1dc12c 100644
--- a/go.mod
+++ b/go.mod
@@ -12,6 +12,7 @@ require (
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1
 	github.com/docker/docker v20.10.24+incompatible
 	github.com/docker/go-connections v0.4.0
+	github.com/elementsproject/glightning v0.0.0-20230525134205-ef34d849f564
 	github.com/golang/protobuf v1.5.2
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/jackc/pgtype v1.8.1
@@ -19,9 +20,8 @@ require (
 	github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1
 	github.com/lightningnetwork/lnd v0.16.2-beta
 	github.com/lightningnetwork/lnd/tlv v1.1.0
-	github.com/niftynei/glightning v0.8.2
 	github.com/stretchr/testify v1.8.1
-	go.starlark.net v0.0.0-20230612165344-9532f5667272
+	go.starlark.net v0.0.0-20230302034142-4b1e35fe2254
 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
 	golang.org/x/sync v0.1.0
 	google.golang.org/grpc v1.50.1
@@ -190,4 +190,9 @@ require (
 
 replace github.com/lightningnetwork/lnd v0.16.2-beta => github.com/breez/lnd v0.15.0-beta.rc6.0.20230501134702-cebcdf1b17fd
 
-replace github.com/niftynei/glightning v0.8.2 => github.com/breez/glightning v0.0.0-20221219103549-0e2a13b9b3ed
+// replace github.com/niftynei/glightning => github.com/elementsproject/glightning v0.0.0-20230525134205-ef34d849f564
+// replace github.com/niftynei/glightning => ~/dev/glightning
+
+// replace github.com/elementsproject/glightning => ~/dev/glightning
+
+replace github.com/breez/lntest => github.com/lnd3v/lntest v0.0.0-20230713001533-d156a5159c7d