diff --git a/.github/workflows/push-docker-custom.yaml b/.github/workflows/push-docker-custom.yaml
index 57783cd..8bc15cd 100644
--- a/.github/workflows/push-docker-custom.yaml
+++ b/.github/workflows/push-docker-custom.yaml
@@ -3,7 +3,7 @@ name: Deploy dev images to GHCR
 on:
   push:
     branches:
-      - 'feature/public-peers'
+      - 'peer-discovery-issue'
 
 jobs:
   push-store-image:
@@ -21,5 +21,5 @@ jobs:
 
       - name: 'Build Inventory Image'
         run: |
-          docker build . --tag ghcr.io/qubic/qubic-nodes:public-peers
-          docker push ghcr.io/qubic/qubic-nodes:public-peers
\ No newline at end of file
+          docker build . --tag ghcr.io/qubic/qubic-nodes:peer-discovery-issue
+          docker push ghcr.io/qubic/qubic-nodes:peer-discovery-issue
\ No newline at end of file
diff --git a/node/peer_discovery.go b/node/peer_discovery.go
index af2d609..7694b3b 100644
--- a/node/peer_discovery.go
+++ b/node/peer_discovery.go
@@ -111,8 +111,10 @@ func (ppd *PublicPeerDiscovery) FindNewPeers(nodes []*Node, addresses []string)
 	for _, node := range nodes {
 		ppd.lookupPeers(node.Peers, peers, nodesChannel, &waitGroup)
 	}
-	waitGroup.Wait()
-	close(nodesChannel)
+	go func() {
+		waitGroup.Wait()
+		close(nodesChannel)
+	}()
 
 	var newNodes []*Node
 	for node := range nodesChannel {