diff --git a/bunker.go b/bunker.go
index 4732af5..b5e38de 100644
--- a/bunker.go
+++ b/bunker.go
@@ -14,7 +14,7 @@ import (
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
 	"github.com/nbd-wtf/go-nostr/nip46"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 	"golang.org/x/exp/slices"
 )
 
diff --git a/count.go b/count.go
index cbb3540..5b5ebe3 100644
--- a/count.go
+++ b/count.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 )
 
 var count = &cli.Command{
diff --git a/decode.go b/decode.go
index 734041a..d57c80e 100644
--- a/decode.go
+++ b/decode.go
@@ -9,7 +9,7 @@ import (
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
 	sdk "github.com/nbd-wtf/nostr-sdk"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 )
 
 var decode = &cli.Command{
diff --git a/encode.go b/encode.go
index 8e86e90..027193a 100644
--- a/encode.go
+++ b/encode.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 )
 
 var encode = &cli.Command{
diff --git a/event.go b/event.go
index becd869..443e6ea 100644
--- a/event.go
+++ b/event.go
@@ -11,7 +11,7 @@ import (
 	"github.com/mailru/easyjson"
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 	"golang.org/x/exp/slices"
 )
 
diff --git a/fetch.go b/fetch.go
index b71fd9a..2ddc4b9 100644
--- a/fetch.go
+++ b/fetch.go
@@ -6,7 +6,7 @@ import (
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
 	sdk "github.com/nbd-wtf/nostr-sdk"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 )
 
 var fetch = &cli.Command{
diff --git a/flags.go b/flags.go
index 5e80b2d..1f332af 100644
--- a/flags.go
+++ b/flags.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/markusmobius/go-dateparser"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 )
 
 type NaturalTimeFlag = cli.FlagBase[nostr.Timestamp, struct{}, naturalTimeValue]
diff --git a/go.mod b/go.mod
index a2c63bf..636588e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
 module github.com/fiatjaf/nak
 
-go 1.21
+go 1.22
 
-toolchain go1.21.0
+toolchain go1.22.4
 
 require (
 	github.com/btcsuite/btcd/btcec/v2 v2.3.3
@@ -13,7 +13,6 @@ require (
 	github.com/markusmobius/go-dateparser v1.2.3
 	github.com/nbd-wtf/go-nostr v0.34.2
 	github.com/nbd-wtf/nostr-sdk v0.0.5
-	github.com/urfave/cli/v3 v3.0.0-alpha9
 	golang.org/x/exp v0.0.0-20240707233637-46b078467d37
 )
 
@@ -24,6 +23,7 @@ require (
 	github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
 	github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
 	github.com/elliotchance/pie/v2 v2.7.0 // indirect
+	github.com/fiatjaf/cli/v3 v3.0.0-20240723181502-e7dd498b16ae // indirect
 	github.com/fiatjaf/eventstore v0.2.16 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
@@ -45,5 +45,3 @@ require (
 	golang.org/x/sys v0.22.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 )
-
-replace github.com/urfave/cli/v3 => github.com/fiatjaf/cli/v3 v3.0.0-20240714232133-bb036558919f
diff --git a/go.sum b/go.sum
index d5b18e0..2e3f780 100644
--- a/go.sum
+++ b/go.sum
@@ -46,6 +46,8 @@ github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fiatjaf/cli/v3 v3.0.0-20240714232133-bb036558919f h1:SQ5W4q4HfpAPA8e8uPADqs4dhI6VvVwUq00DtlpHIt0=
 github.com/fiatjaf/cli/v3 v3.0.0-20240714232133-bb036558919f/go.mod h1:Z1ItyMma7t6I7zHG9OpbExhHQOSkFf/96n+mAZ9MtVI=
+github.com/fiatjaf/cli/v3 v3.0.0-20240723181502-e7dd498b16ae h1:0B/1dU3YECIbPoBIRTQ4c0scZCNz9TVHtQpiODGrTTo=
+github.com/fiatjaf/cli/v3 v3.0.0-20240723181502-e7dd498b16ae/go.mod h1:aAWPO4bixZZxPtOnH6K3q4GbQ0jftUNDW9Oa861IRew=
 github.com/fiatjaf/eventstore v0.2.16 h1:NR64mnyUT5nJR8Sj2AwJTd1Hqs5kKJcCFO21ggUkvWg=
 github.com/fiatjaf/eventstore v0.2.16/go.mod h1:rUc1KhVufVmC+HUOiuPweGAcvG6lEOQCkRCn2Xn5VRA=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
diff --git a/helpers.go b/helpers.go
index 830fe7f..b15f12a 100644
--- a/helpers.go
+++ b/helpers.go
@@ -17,7 +17,7 @@ import (
 	"github.com/nbd-wtf/go-nostr/nip19"
 	"github.com/nbd-wtf/go-nostr/nip46"
 	"github.com/nbd-wtf/go-nostr/nip49"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 )
 
 const (
diff --git a/key.go b/key.go
index ad66e63..86fee3b 100644
--- a/key.go
+++ b/key.go
@@ -14,7 +14,7 @@ import (
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
 	"github.com/nbd-wtf/go-nostr/nip49"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 )
 
 var key = &cli.Command{
diff --git a/main.go b/main.go
index 9226f3f..3861933 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 )
 
 var app = &cli.Command{
diff --git a/relay.go b/relay.go
index 703898b..9e674d8 100644
--- a/relay.go
+++ b/relay.go
@@ -14,7 +14,7 @@ import (
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip11"
 	"github.com/nbd-wtf/go-nostr/nip86"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 )
 
 var relay = &cli.Command{
diff --git a/req.go b/req.go
index d00ce37..61232a8 100644
--- a/req.go
+++ b/req.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/mailru/easyjson"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 )
 
 const CATEGORY_FILTER_ATTRIBUTES = "FILTER ATTRIBUTES"
diff --git a/verify.go b/verify.go
index 7860b8d..f019f8e 100644
--- a/verify.go
+++ b/verify.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/urfave/cli/v3"
+	"github.com/fiatjaf/cli/v3"
 )
 
 var verify = &cli.Command{