diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 602b224dcf..a495ee2a03 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,25 +1,22 @@
-name: Docker Image CI
-
+name: Docker build & push
 on:
   push:
-    branches: [ master ]
-
+  release:
+    types: [published]
 jobs:
-
   build:
-
+    env:
+      REGISTRY: ghcr.io
+      IMAGENAME: ${{ github.event.repository.name }}
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v3
-    - name: docker login
-      uses: docker/login-action@v2
+    - uses: actions/checkout@v2
+      name: Check out code
+    - name: Docker build
+      uses: mr-smithers-excellent/docker-build-push@v5
+      id: build
       with:
-        username: ${{ secrets.DOCKER_USER }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-    
-    - name: build the Docker image
-      run: docker build -t acinq/eclair .
-      
-    - name: docker push
-      run: docker push acinq/eclair 
+        image: ${{ env.IMAGENAME }}
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index f72ed6206a..a0c5670a2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ DeleteMe*.*
 jdbcUrlFile_*.tmp
 
 .DS_Store
+.vscode
diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/crypto/keymanager/LocalNodeKeyManager.scala b/eclair-core/src/main/scala/fr/acinq/eclair/crypto/keymanager/LocalNodeKeyManager.scala
index 484554deff..8d9ed455a1 100644
--- a/eclair-core/src/main/scala/fr/acinq/eclair/crypto/keymanager/LocalNodeKeyManager.scala
+++ b/eclair-core/src/main/scala/fr/acinq/eclair/crypto/keymanager/LocalNodeKeyManager.scala
@@ -28,7 +28,7 @@ object LocalNodeKeyManager {
   // Note that the node path and the above channel path are on different branches so even if the
   // node key is compromised there is no way to retrieve the wallet keys
   def keyBasePath(chainHash: ByteVector32): List[Long] = (chainHash: @unchecked) match {
-    case Block.RegtestGenesisBlock.hash | Block.TestnetGenesisBlock.hash | Block.SignetGenesisBlock.hash => DeterministicWallet.hardened(46) :: DeterministicWallet.hardened(0) :: Nil
+    case Block.RegtestGenesisBlock.hash | Block.TestnetGenesisBlock.hash | Block.SignetGenesisBlock.hash => DeterministicWallet.hardened(1017) :: DeterministicWallet.hardened(1) :: DeterministicWallet.hardened(6) :: Nil
     case Block.LivenetGenesisBlock.hash => DeterministicWallet.hardened(47) :: DeterministicWallet.hardened(0) :: Nil
   }
 }