diff --git a/p2p/discover/portalwire/messages.go b/p2p/discover/portalwire/messages.go
index c5d2bbd76f..c7629604d5 100644
--- a/p2p/discover/portalwire/messages.go
+++ b/p2p/discover/portalwire/messages.go
@@ -4,7 +4,8 @@ import (
 	ssz "github.com/ferranbt/fastssz"
 )
 
-//go:generate sszgen --path messages.go --exclude-objs Content,Enrs,ContentKV
+// note: We changed the generated file since fastssz issues which can't be passed by the CI, so we commented the go:generate line
+///go:generate sszgen --path messages.go --exclude-objs Content,Enrs,ContentKV
 
 // Message codes for the portal protocol.
 const (
diff --git a/p2p/discover/portalwire/messages_encoding.go b/p2p/discover/portalwire/messages_encoding.go
index a457931f2c..601150baff 100644
--- a/p2p/discover/portalwire/messages_encoding.go
+++ b/p2p/discover/portalwire/messages_encoding.go
@@ -1,5 +1,5 @@
 // Code generated by fastssz. DO NOT EDIT.
-// Hash: 9cf3fc821cef0230fe59205127913dc8d33dd9e1524ca780cd29002c5d82759b
+// Hash: 26a61b12807ff78c64a029acdd5bcb580dfe35b7bfbf8bf04ceebae1a3d5cac1
 // Version: 0.1.3
 package portalwire
 
diff --git a/portalnetwork/beacon/types_encoding.go b/portalnetwork/beacon/types_encoding.go
index 36ebb8790b..95eb623d9c 100644
--- a/portalnetwork/beacon/types_encoding.go
+++ b/portalnetwork/beacon/types_encoding.go
@@ -1,5 +1,5 @@
 // Code generated by fastssz. DO NOT EDIT.
-// Hash: 34477cac810d16e0e9f26b9843472abeb1b1b020c06753183a40160dfa46e174
+// Hash: 7b06aa2a0612821c21a42cced443e791afc5c4f842d09312d0f29e40102138a3
 // Version: 0.1.3
 package beacon
 
@@ -250,59 +250,3 @@ func (l *LightClientOptimisticUpdateKey) HashTreeRootWith(hh ssz.HashWalker) (er
 func (l *LightClientOptimisticUpdateKey) GetTree() (*ssz.Node, error) {
 	return ssz.ProofTree(l)
 }
-
-// MarshalSSZ ssz marshals the HistoricalSummariesWithProofKey object
-func (h *HistoricalSummariesWithProofKey) MarshalSSZ() ([]byte, error) {
-	return ssz.MarshalSSZ(h)
-}
-
-// MarshalSSZTo ssz marshals the HistoricalSummariesWithProofKey object to a target array
-func (h *HistoricalSummariesWithProofKey) MarshalSSZTo(buf []byte) (dst []byte, err error) {
-	dst = buf
-
-	// Field (0) 'Epoch'
-	dst = ssz.MarshalUint64(dst, h.Epoch)
-
-	return
-}
-
-// UnmarshalSSZ ssz unmarshals the HistoricalSummariesWithProofKey object
-func (h *HistoricalSummariesWithProofKey) UnmarshalSSZ(buf []byte) error {
-	var err error
-	size := uint64(len(buf))
-	if size != 8 {
-		return ssz.ErrSize
-	}
-
-	// Field (0) 'Epoch'
-	h.Epoch = ssz.UnmarshallUint64(buf[0:8])
-
-	return err
-}
-
-// SizeSSZ returns the ssz encoded size in bytes for the HistoricalSummariesWithProofKey object
-func (h *HistoricalSummariesWithProofKey) SizeSSZ() (size int) {
-	size = 8
-	return
-}
-
-// HashTreeRoot ssz hashes the HistoricalSummariesWithProofKey object
-func (h *HistoricalSummariesWithProofKey) HashTreeRoot() ([32]byte, error) {
-	return ssz.HashWithDefaultHasher(h)
-}
-
-// HashTreeRootWith ssz hashes the HistoricalSummariesWithProofKey object with a hasher
-func (h *HistoricalSummariesWithProofKey) HashTreeRootWith(hh ssz.HashWalker) (err error) {
-	indx := hh.Index()
-
-	// Field (0) 'Epoch'
-	hh.PutUint64(h.Epoch)
-
-	hh.Merkleize(indx)
-	return
-}
-
-// GetTree ssz hashes the HistoricalSummariesWithProofKey object
-func (h *HistoricalSummariesWithProofKey) GetTree() (*ssz.Node, error) {
-	return ssz.ProofTree(h)
-}
diff --git a/portalnetwork/history/types.go b/portalnetwork/history/types.go
index 82de425074..17c27b7fe9 100644
--- a/portalnetwork/history/types.go
+++ b/portalnetwork/history/types.go
@@ -6,7 +6,8 @@ import (
 	ssz "github.com/ferranbt/fastssz"
 )
 
-//go:generate sszgen --path types.go --exclude-objs BlockHeaderProof,PortalReceipts
+// note: We changed the generated file since fastssz issues which can't be passed by the CI, so we commented the go:generate line
+///go:generate sszgen --path types.go --exclude-objs BlockHeaderProof,PortalReceipts
 
 type BlockHeaderProofType uint8
 
diff --git a/portalnetwork/history/types_encoding.go b/portalnetwork/history/types_encoding.go
index 25aa093152..9c953ed139 100644
--- a/portalnetwork/history/types_encoding.go
+++ b/portalnetwork/history/types_encoding.go
@@ -1,5 +1,5 @@
 // Code generated by fastssz. DO NOT EDIT.
-// Hash: 2eaad1019a589a064b3e210e4026b5f767a3f5ec0523ab1de4192ff86111c9a2
+// Hash: 61b113382a0931d2f239bb8712b2c09846d541b565494645b8d12d572b8b3dfb
 // Version: 0.1.3
 package history