diff --git a/go.mod b/go.mod
index 5791c27f4d65a8ec62e9e9ec859bc287c751d327..39951f3dbc9c6ed981d974302ffcf3aa913f91de 100644
--- a/go.mod
+++ b/go.mod
@@ -44,7 +44,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.9.0
 	github.com/tent/canonical-json-go v0.0.0-20130607151641-96e4ba3a7613
-	github.com/theupdateframework/go-tuf v0.0.0-20210722233521-90e262754396
+	github.com/theupdateframework/go-tuf v0.0.0-20211006142131-1dc15a86c64d
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tilinna/clock v1.1.0 // indirect
 	github.com/ulikunitz/xz v0.5.10 // indirect
diff --git a/go.sum b/go.sum
index 4b3755f2f53f5625d3c5771f69b9c6ba8ca4cd8a..74e563efeb70d86e67ad89c6073b637c7fe158e2 100644
--- a/go.sum
+++ b/go.sum
@@ -1172,6 +1172,8 @@ github.com/tent/canonical-json-go v0.0.0-20130607151641-96e4ba3a7613 h1:iGnD/q91
 github.com/tent/canonical-json-go v0.0.0-20130607151641-96e4ba3a7613/go.mod h1:g6AnIpDSYMcphz193otpSIzN+11Rs+AAIIC6rm1enug=
 github.com/theupdateframework/go-tuf v0.0.0-20210722233521-90e262754396 h1:j4odVZMwglHp54CYsNHd0wls+lkQzxloQU9AQjQu0W4=
 github.com/theupdateframework/go-tuf v0.0.0-20210722233521-90e262754396/go.mod h1:L+uU/NRFK/7h0NYAnsmvsX9EghDB5QVCcHCIrK2h5nw=
+github.com/theupdateframework/go-tuf v0.0.0-20211006142131-1dc15a86c64d h1:6u8WdfsjnV7hMFBekqY6j9WrOLEzhWFOAWmb8Yys0J8=
+github.com/theupdateframework/go-tuf v0.0.0-20211006142131-1dc15a86c64d/go.mod h1:oujGMqigj0NWDqeWBCzleayXXtux27r+kHAR2t5Yuk8=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
diff --git a/pkg/pki/tuf/tuf.go b/pkg/pki/tuf/tuf.go
index b5255ebb2bc616cf961cab0ca9cd2c6d57c37b36..077863a447a0b35e5d62cdf92f952c0d476d3834 100644
--- a/pkg/pki/tuf/tuf.go
+++ b/pkg/pki/tuf/tuf.go
@@ -70,19 +70,8 @@ func (s Signature) CanonicalValue() ([]byte, error) {
 	if s.signed == nil {
 		return nil, fmt.Errorf("tuf manifest has not been initialized")
 	}
-
-	var decoded map[string]interface{}
-	if err := json.Unmarshal(s.signed.Signed, &decoded); err != nil {
-		return nil, err
-	}
-
-	canonicalSigned, err := cjson.Marshal(decoded)
-	if err != nil {
-		return nil, err
-	}
-	canonical, err := cjson.Marshal(&data.Signed{
-		Signed:     canonicalSigned,
-		Signatures: s.signed.Signatures})
+	// TODO(asraa): Should the Signed payload be canonicalized?
+	canonical, err := cjson.Marshal(s)
 	if err != nil {
 		return nil, err
 	}
@@ -154,22 +143,11 @@ func NewPublicKey(r io.Reader) (*PublicKey, error) {
 
 // CanonicalValue implements the pki.PublicKey interface
 func (k PublicKey) CanonicalValue() (encoded []byte, err error) {
+	// TODO(asraa): Should the Signed payload be canonicalized?
 	if k.root == nil {
 		return nil, fmt.Errorf("tuf root has not been initialized")
 	}
-
-	var decoded map[string]interface{}
-	if err := json.Unmarshal(k.root.Signed, &decoded); err != nil {
-		return nil, err
-	}
-
-	canonicalSigned, err := cjson.Marshal(decoded)
-	if err != nil {
-		return nil, err
-	}
-	canonical, err := cjson.Marshal(&data.Signed{
-		Signed:     canonicalSigned,
-		Signatures: k.root.Signatures})
+	canonical, err := cjson.Marshal(k.root)
 	if err != nil {
 		return nil, err
 	}
diff --git a/tests/tuf.go b/tests/tuf.go
index f47fcd947cf60f265466b53bbba0e056fa4a248b..3714057f33f623e7326fefbfd762363f281ff0a7 100644
--- a/tests/tuf.go
+++ b/tests/tuf.go
@@ -42,7 +42,7 @@ func generateTestRepo(t *testing.T, files map[string][]byte) tuf.LocalStore {
 	for file := range files {
 		repo.AddTarget(file, nil)
 	}
-	repo.Snapshot(tuf.CompressionTypeNone)
+	repo.Snapshot()
 	repo.Timestamp()
 	repo.Commit()