diff --git a/Makefile b/Makefile
index 8f0a2388..4be12f27 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ BINS := \
   hbs2-keyman       \
   git-remote-hbs2   \
   git-hbs2          \
+  git-remote-hbs21  \
 
 ifeq ($(origin .RECIPEPREFIX), undefined)
   $(error This Make does not support .RECIPEPREFIX. Please use GNU Make 4.0 or later)
diff --git a/hbs2-core/lib/HBS2/Defaults.hs b/hbs2-core/lib/HBS2/Defaults.hs
index aac4a6c4..2d31a5d8 100644
--- a/hbs2-core/lib/HBS2/Defaults.hs
+++ b/hbs2-core/lib/HBS2/Defaults.hs
@@ -70,7 +70,7 @@ defBlockWipTimeout :: TimeSpec
 defBlockWipTimeout = defCookieTimeout
 
 defBlockInfoTimeout :: Timeout 'Seconds
-defBlockInfoTimeout = 10
+defBlockInfoTimeout = 2
 
 defBlockInfoTimeoutSpec :: TimeSpec
 defBlockInfoTimeoutSpec = toTimeSpec defBlockInfoTimeout
diff --git a/nix/peer/flake.lock b/nix/peer/flake.lock
index ed7f90d2..0241ecd2 100644
--- a/nix/peer/flake.lock
+++ b/nix/peer/flake.lock
@@ -295,15 +295,16 @@
         "suckless-conf": "suckless-conf_2"
       },
       "locked": {
-        "lastModified": 1707584207,
-        "narHash": "sha256-y4JimRbs6Edfhh1UnJLdX1jrnfcTFmAU+h89ir23gno=",
-        "rev": "039d2bfefcd11f67ed957a71d650e877f8500611",
-        "revCount": 1062,
+        "lastModified": 1707747161,
+        "narHash": "sha256-eVTLMpxXUeto7Socc02vQg5sc59O64KQUpkOKcFF7IY=",
+        "ref": "new-git-export-3",
+        "rev": "e17ca1578e6843c0edd4bee8ae976475cff867b9",
+        "revCount": 1096,
         "type": "git",
         "url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP"
       },
       "original": {
-        "rev": "039d2bfefcd11f67ed957a71d650e877f8500611",
+        "ref": "new-git-export-3",
         "type": "git",
         "url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP"
       }
diff --git a/nix/peer/flake.nix b/nix/peer/flake.nix
index 6c22664e..0313fca2 100644
--- a/nix/peer/flake.nix
+++ b/nix/peer/flake.nix
@@ -6,7 +6,7 @@
   inputs = {
     extra-container.url = "github:erikarvstedt/extra-container";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    hbs2.url = "git+http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP?rev=039d2bfefcd11f67ed957a71d650e877f8500611";
+    hbs2.url = "git+http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP?ref=new-git-export-3";
     hbs2.inputs.nixpkgs.follows = "nixpkgs";
 
     home-manager.url = "github:nix-community/home-manager";
@@ -54,7 +54,16 @@
                       home.stateVersion = "23.05";
 
                       xdg.configFile = {
-                        ".hbs2-peer/config".text = ''
+
+                        "hbs2-peer/default.key".text = ''
+# hbs2 credentials file
+# keep it private
+
+rmbTHUgv7NPkygrgEbPWTjQbVTx9uwWJ7sJVQRKK7ygM73q5Q7JVYhpwfytK
+kzoNq65jn1zDCUUMwLFzXeu4ETjG4bhYNM7FHU9xY4VdwEww156iJeoydJ2y
+j1u3RJEr8kosBH2DR8XMY6Mj8s
+'';
+                        "hbs2-peer/config".text = ''
 ;; hbs2-peer config file
 
 listen "0.0.0.0:7351"