diff --git a/deployment/ccip/changeset/solana_state.go b/deployment/ccip/changeset/solana_state.go
index c7655bb6d99..a967a7de05b 100644
--- a/deployment/ccip/changeset/solana_state.go
+++ b/deployment/ccip/changeset/solana_state.go
@@ -1,9 +1,11 @@
 package changeset
 
 // TODO: create similar struct as CCIPChainState, but with Sol specific primitives
+// https://smartcontract-it.atlassian.net/browse/INTAUTO-360
 // SolChainState holds a Go binding for all the currently deployed CCIP programs
 // on a chain. If a binding is nil, it means here is no such contract on the chain.
 type SolCCIPChainState struct {
 }
 
-// TODO: create GenerateSolanaView function similar to GenerateView
\ No newline at end of file
+// TODO: create GenerateSolanaView function similar to GenerateView
+// https://smartcontract-it.atlassian.net/browse/INTAUTO-358
\ No newline at end of file
diff --git a/deployment/ccip/changeset/state.go b/deployment/ccip/changeset/state.go
index 4a2806796f0..12d49d43f32 100644
--- a/deployment/ccip/changeset/state.go
+++ b/deployment/ccip/changeset/state.go
@@ -302,6 +302,7 @@ func (s CCIPOnChainState) View(chains []uint64) (map[string]view.ChainView, map[
 		}
 		chainState := s.Chains[chainSelector]
 		// TODO: call Solana view generation here (switch case on chainSelector)
+		// https://smartcontract-it.atlassian.net/browse/INTAUTO-359
 		chainView, err := chainState.GenerateView()
 		if err != nil {
 			return m, sm, err
@@ -327,6 +328,7 @@ func LoadOnchainState(e deployment.Environment) (CCIPOnChainState, error) {
 			}
 		}
 		// TODO: Load Solana state here based on chainSelector
+		// https://smartcontract-it.atlassian.net/browse/INTAUTO-361
 		chainState, err := LoadChainState(chain, addresses)
 		if err != nil {
 			return state, err
@@ -338,6 +340,7 @@ func LoadOnchainState(e deployment.Environment) (CCIPOnChainState, error) {
 
 // LoadChainState Loads all state for a chain into state
 // TODO: Add function LoadSolanaChainState
+// https://smartcontract-it.atlassian.net/browse/INTAUTO-362
 func LoadChainState(chain deployment.Chain, addresses map[string]deployment.TypeAndVersion) (CCIPChainState, error) {
 	var state CCIPChainState
 	mcmsWithTimelock, err := commoncs.MaybeLoadMCMSWithTimelockChainState(chain, addresses)