diff --git a/.goreleaser.yml b/.goreleaser.yml
index 2e91755..c290793 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -33,7 +33,7 @@ release:
 nfpms:
 - maintainer: Samuel Lorch <sam@lorch.net>
   description: A CLI for Passbolt.
-  homepage: https://github.com/speatzle/go-passbolt-cli
+  homepage: https://github.com/passbolt/go-passbolt-cli
   license: MIT
   contents:
     - src: /home/runner/work/go-passbolt-cli/go-passbolt-cli/completion/bash
diff --git a/README.md b/README.md
index f876e6c..775dc00 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # go-passbolt-cli
 A CLI tool to interact with Passbolt, a Open source Password Manager for Teams.
 
-If you want to do something more complicated: [this](https://github.com/speatzle/go-passbolt) Go Module to Interact with Passbolt from Go might intrest you.
+If you want to do something more complicated: [this](https://github.com/passbolt/go-passbolt) Go Module to Interact with Passbolt from Go might intrest you.
 
 
 Disclaimer: This project is community driven and not associated with Passbolt SA
@@ -16,7 +16,7 @@ Disclaimer: This project is community driven and not associated with Passbolt SA
 Note: tab completion and manpages will need to be installed manually.
 
 ## Via Go:
-    go install github.com/speatzle/go-passbolt-cli
+    go install github.com/passbolt/go-passbolt-cli
 Note: this will install the binary as go-passbolt-cli, also tab completion and manpages will be missing.
 
 # Getting Started
@@ -93,6 +93,6 @@ you can setup MFA also using the configuration sub command, only TOTP is support
 to enable Server Verification you need to run `passbolt verify` once, after that the server will always be verified if the same config is used
 
 # Documentation
-Usage for all Subcommands is [here](https://github.com/speatzle/go-passbolt-cli/wiki/go-passbolt-cli).
+Usage for all Subcommands is [here](https://github.com/passbolt/go-passbolt-cli/wiki/go-passbolt-cli).
 And is also available via `man passbolt`
 
diff --git a/cmd/create.go b/cmd/create.go
index 87e5cf5..c758b86 100644
--- a/cmd/create.go
+++ b/cmd/create.go
@@ -1,10 +1,10 @@
 package cmd
 
 import (
-	"github.com/speatzle/go-passbolt-cli/folder"
-	"github.com/speatzle/go-passbolt-cli/group"
-	"github.com/speatzle/go-passbolt-cli/resource"
-	"github.com/speatzle/go-passbolt-cli/user"
+	"github.com/passbolt/go-passbolt-cli/folder"
+	"github.com/passbolt/go-passbolt-cli/group"
+	"github.com/passbolt/go-passbolt-cli/resource"
+	"github.com/passbolt/go-passbolt-cli/user"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/delete.go b/cmd/delete.go
index d11c461..f99c8de 100644
--- a/cmd/delete.go
+++ b/cmd/delete.go
@@ -1,10 +1,10 @@
 package cmd
 
 import (
-	"github.com/speatzle/go-passbolt-cli/folder"
-	"github.com/speatzle/go-passbolt-cli/group"
-	"github.com/speatzle/go-passbolt-cli/resource"
-	"github.com/speatzle/go-passbolt-cli/user"
+	"github.com/passbolt/go-passbolt-cli/folder"
+	"github.com/passbolt/go-passbolt-cli/group"
+	"github.com/passbolt/go-passbolt-cli/resource"
+	"github.com/passbolt/go-passbolt-cli/user"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/export.go b/cmd/export.go
index 9aa12cb..2c16910 100644
--- a/cmd/export.go
+++ b/cmd/export.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/speatzle/go-passbolt-cli/keepass"
+	"github.com/passbolt/go-passbolt-cli/keepass"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/get.go b/cmd/get.go
index 624d91e..24fbc33 100644
--- a/cmd/get.go
+++ b/cmd/get.go
@@ -1,10 +1,10 @@
 package cmd
 
 import (
-	"github.com/speatzle/go-passbolt-cli/folder"
-	"github.com/speatzle/go-passbolt-cli/group"
-	"github.com/speatzle/go-passbolt-cli/resource"
-	"github.com/speatzle/go-passbolt-cli/user"
+	"github.com/passbolt/go-passbolt-cli/folder"
+	"github.com/passbolt/go-passbolt-cli/group"
+	"github.com/passbolt/go-passbolt-cli/resource"
+	"github.com/passbolt/go-passbolt-cli/user"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/list.go b/cmd/list.go
index 118135d..f4672aa 100644
--- a/cmd/list.go
+++ b/cmd/list.go
@@ -1,10 +1,10 @@
 package cmd
 
 import (
-	"github.com/speatzle/go-passbolt-cli/folder"
-	"github.com/speatzle/go-passbolt-cli/group"
-	"github.com/speatzle/go-passbolt-cli/resource"
-	"github.com/speatzle/go-passbolt-cli/user"
+	"github.com/passbolt/go-passbolt-cli/folder"
+	"github.com/passbolt/go-passbolt-cli/group"
+	"github.com/passbolt/go-passbolt-cli/resource"
+	"github.com/passbolt/go-passbolt-cli/user"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/move.go b/cmd/move.go
index 90b7538..f848279 100644
--- a/cmd/move.go
+++ b/cmd/move.go
@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"github.com/speatzle/go-passbolt-cli/folder"
-	"github.com/speatzle/go-passbolt-cli/resource"
+	"github.com/passbolt/go-passbolt-cli/folder"
+	"github.com/passbolt/go-passbolt-cli/resource"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/share.go b/cmd/share.go
index 21aaecc..e32b84e 100644
--- a/cmd/share.go
+++ b/cmd/share.go
@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"github.com/speatzle/go-passbolt-cli/folder"
-	"github.com/speatzle/go-passbolt-cli/resource"
+	"github.com/passbolt/go-passbolt-cli/folder"
+	"github.com/passbolt/go-passbolt-cli/resource"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/update.go b/cmd/update.go
index f1b2079..bd09631 100644
--- a/cmd/update.go
+++ b/cmd/update.go
@@ -1,10 +1,10 @@
 package cmd
 
 import (
-	"github.com/speatzle/go-passbolt-cli/folder"
-	"github.com/speatzle/go-passbolt-cli/group"
-	"github.com/speatzle/go-passbolt-cli/resource"
-	"github.com/speatzle/go-passbolt-cli/user"
+	"github.com/passbolt/go-passbolt-cli/folder"
+	"github.com/passbolt/go-passbolt-cli/group"
+	"github.com/passbolt/go-passbolt-cli/resource"
+	"github.com/passbolt/go-passbolt-cli/user"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/verify.go b/cmd/verify.go
index 3d5d38a..0570367 100644
--- a/cmd/verify.go
+++ b/cmd/verify.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"syscall"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/api"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"golang.org/x/term"
diff --git a/folder/create.go b/folder/create.go
index bf60448..5b18b0c 100644
--- a/folder/create.go
+++ b/folder/create.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/folder/delete.go b/folder/delete.go
index 35e32e3..320ed48 100644
--- a/folder/delete.go
+++ b/folder/delete.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt-cli/util"
 	"github.com/spf13/cobra"
 )
 
diff --git a/folder/get.go b/folder/get.go
index 15ef023..edf5e72 100644
--- a/folder/get.go
+++ b/folder/get.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/alessio/shellescape"
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/folder/list.go b/folder/list.go
index dfea930..36d6a27 100644
--- a/folder/list.go
+++ b/folder/list.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/alessio/shellescape"
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/api"
 	"github.com/spf13/cobra"
 
 	"github.com/pterm/pterm"
diff --git a/folder/move.go b/folder/move.go
index 65caa04..0f8f75d 100644
--- a/folder/move.go
+++ b/folder/move.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/folder/share.go b/folder/share.go
index 45ad91a..7096c7d 100644
--- a/folder/share.go
+++ b/folder/share.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/folder/update.go b/folder/update.go
index b365545..06454f9 100644
--- a/folder/update.go
+++ b/folder/update.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/go.mod b/go.mod
index 82c6c3b..b508d91 100644
--- a/go.mod
+++ b/go.mod
@@ -1,18 +1,20 @@
-module github.com/speatzle/go-passbolt-cli
+module github.com/passbolt/go-passbolt-cli
 
 go 1.16
 
 require (
 	github.com/alessio/shellescape v1.4.1
 	github.com/gookit/color v1.5.0 // indirect
-	github.com/pterm/pterm v0.12.36
-	github.com/speatzle/go-passbolt v0.5.4
-	github.com/spf13/afero v1.8.0 // indirect
+	github.com/passbolt/go-passbolt v0.5.5
+	github.com/pterm/pterm v0.12.37
+	github.com/spf13/afero v1.8.1 // indirect
 	github.com/spf13/cobra v1.3.0
 	github.com/spf13/viper v1.10.1
 	github.com/tobischo/gokeepasslib/v3 v3.2.4
+	golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
+	golang.org/x/sys v0.0.0-20220222160653-b146bcec3beb // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
-	gopkg.in/ini.v1 v1.66.3 // indirect
+	gopkg.in/ini.v1 v1.66.4 // indirect
 )
 
-// replace github.com/speatzle/go-passbolt => ../go-passbolt
+// replace github.com/passbolt/go-passbolt => ../go-passbolt
diff --git a/go.sum b/go.sum
index eae2276..7254d94 100644
--- a/go.sum
+++ b/go.sum
@@ -317,6 +317,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/passbolt/go-passbolt v0.5.5 h1:jkKp/x4NYrv+2eYhqJgLfATgcipqsrNyMHadyGngCao=
+github.com/passbolt/go-passbolt v0.5.5/go.mod h1:drZXAx/5iLqH9MH46HCgy+taTkJ0Akw3igoBV8TnbF4=
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -346,8 +348,8 @@ github.com/pterm/pterm v0.12.29/go.mod h1:WI3qxgvoQFFGKGjGnJR849gU0TsEOvKn5Q8LlY
 github.com/pterm/pterm v0.12.30/go.mod h1:MOqLIyMOgmTDz9yorcYbcw+HsgoZo3BQfg2wtl3HEFE=
 github.com/pterm/pterm v0.12.31/go.mod h1:32ZAWZVXD7ZfG0s8qqHXePte42kdz8ECtRyEejaWgXU=
 github.com/pterm/pterm v0.12.33/go.mod h1:x+h2uL+n7CP/rel9+bImHD5lF3nM9vJj80k9ybiiTTE=
-github.com/pterm/pterm v0.12.36 h1:Ui5zZj7xA8lXR0CxWXlKGCQMW1cZVUMOS8jEXs6ur/g=
-github.com/pterm/pterm v0.12.36/go.mod h1:NjiL09hFhT/vWjQHSj1athJpx6H8cjpHXNAK5bUw8T8=
+github.com/pterm/pterm v0.12.37 h1:QGOyuaDUmY3yTbP0k6i0uPNqNHA9YofEBQDy0tIyKTA=
+github.com/pterm/pterm v0.12.37/go.mod h1:NjiL09hFhT/vWjQHSj1athJpx6H8cjpHXNAK5bUw8T8=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@@ -363,12 +365,10 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/speatzle/go-passbolt v0.5.4 h1:wNIB7sj3eE6EBtlrPN0YF0Y0regkzgbM19LRVwCuzB8=
-github.com/speatzle/go-passbolt v0.5.4/go.mod h1:TPuuOVOxdy07Aw+4H5dJA+HULD5wcc46ORuUw8i1ro8=
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60=
-github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
+github.com/spf13/afero v1.8.1 h1:izYHOT71f9iZ7iq37Uqjael60/vYC6vMtzedudZ0zEk=
+github.com/spf13/afero v1.8.1/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
 github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
 github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0=
@@ -429,8 +429,9 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE=
 golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE=
+golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -611,8 +612,9 @@ golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a h1:ppl5mZgokTT8uPkmYOyEUmPTr3ypaKkg5eFOGrAmxxE=
 golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220222160653-b146bcec3beb h1:Ilbx3DBAwVTR3lKQBhB5046dy7jic04dBpmG4fW/ru0=
+golang.org/x/sys v0.0.0-20220222160653-b146bcec3beb/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -845,8 +847,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.66.3 h1:jRskFVxYaMGAMUbN0UZ7niA9gzL9B49DOqE78vg0k3w=
-gopkg.in/ini.v1 v1.66.3/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
+gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/group/create.go b/group/create.go
index e9b9cbf..4c1b8ae 100644
--- a/group/create.go
+++ b/group/create.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/group/delete.go b/group/delete.go
index 532efa5..9ba9c58 100644
--- a/group/delete.go
+++ b/group/delete.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt-cli/util"
 	"github.com/spf13/cobra"
 )
 
diff --git a/group/get.go b/group/get.go
index 7326700..f7dcdeb 100644
--- a/group/get.go
+++ b/group/get.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 
 	"github.com/alessio/shellescape"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/pterm/pterm"
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/group/list.go b/group/list.go
index 77fd846..e7e8332 100644
--- a/group/list.go
+++ b/group/list.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/alessio/shellescape"
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/api"
 	"github.com/spf13/cobra"
 
 	"github.com/pterm/pterm"
diff --git a/group/update.go b/group/update.go
index b969b4f..af806cc 100644
--- a/group/update.go
+++ b/group/update.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/keepass/export.go b/keepass/export.go
index 622a511..c4b62d0 100644
--- a/keepass/export.go
+++ b/keepass/export.go
@@ -6,10 +6,10 @@ import (
 	"os"
 	"syscall"
 
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/pterm/pterm"
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/api"
-	"github.com/speatzle/go-passbolt/helper"
 	"github.com/spf13/cobra"
 	"github.com/tobischo/gokeepasslib/v3"
 	w "github.com/tobischo/gokeepasslib/v3/wrappers"
@@ -85,6 +85,7 @@ func KeepassExport(cmd *cobra.Command, args []string) error {
 	rootGroup.Name = "root"
 
 	pterm.EnableStyling()
+	pterm.DisableColor()
 	progressbar, err := pterm.DefaultProgressbar.WithTitle("Decryping Resources").WithTotal(len(resources)).Start()
 	if err != nil {
 		return fmt.Errorf("Progress: %w", err)
diff --git a/main.go b/main.go
index 196c3b2..11469e5 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/speatzle/go-passbolt-cli/cmd"
+import "github.com/passbolt/go-passbolt-cli/cmd"
 
 func main() {
 	cmd.Execute()
diff --git a/resource/create.go b/resource/create.go
index db72e92..799c0d5 100644
--- a/resource/create.go
+++ b/resource/create.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/resource/delete.go b/resource/delete.go
index b75e49b..ea3b4b9 100644
--- a/resource/delete.go
+++ b/resource/delete.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt-cli/util"
 	"github.com/spf13/cobra"
 )
 
diff --git a/resource/get.go b/resource/get.go
index bc4c51c..699c944 100644
--- a/resource/get.go
+++ b/resource/get.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/alessio/shellescape"
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/resource/list.go b/resource/list.go
index 07b95ed..8397325 100644
--- a/resource/list.go
+++ b/resource/list.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 
 	"github.com/alessio/shellescape"
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/api"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 
 	"github.com/pterm/pterm"
diff --git a/resource/move.go b/resource/move.go
index be835b6..a95f754 100644
--- a/resource/move.go
+++ b/resource/move.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/resource/share.go b/resource/share.go
index 51c4a28..a859525 100644
--- a/resource/share.go
+++ b/resource/share.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/resource/update.go b/resource/update.go
index 47cdbc6..797c9cb 100644
--- a/resource/update.go
+++ b/resource/update.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/user/create.go b/user/create.go
index d2822f7..4c1b937 100644
--- a/user/create.go
+++ b/user/create.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/user/delete.go b/user/delete.go
index b4c1b17..1508e87 100644
--- a/user/delete.go
+++ b/user/delete.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/user/get.go b/user/get.go
index 1e7b5e1..62029c8 100644
--- a/user/get.go
+++ b/user/get.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/alessio/shellescape"
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/user/list.go b/user/list.go
index 00a8a72..52644ba 100644
--- a/user/list.go
+++ b/user/list.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/alessio/shellescape"
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/api"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/api"
 	"github.com/spf13/cobra"
 
 	"github.com/pterm/pterm"
diff --git a/user/update.go b/user/update.go
index 11c431d..beafc38 100644
--- a/user/update.go
+++ b/user/update.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/speatzle/go-passbolt-cli/util"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt-cli/util"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/cobra"
 )
 
diff --git a/util/client.go b/util/client.go
index 99fee34..1ba4946 100644
--- a/util/client.go
+++ b/util/client.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"syscall"
 
-	"github.com/speatzle/go-passbolt/api"
-	"github.com/speatzle/go-passbolt/helper"
+	"github.com/passbolt/go-passbolt/api"
+	"github.com/passbolt/go-passbolt/helper"
 	"github.com/spf13/viper"
 	"golang.org/x/term"
 )