diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27dee1ad..2d988d3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,20 +14,24 @@
 
 ## [Unreleased]
 
+### Improvements
+
+- [#34](https://github.com/KYVENetwork/chain/pull/34) Support [Heighliner](https://github.com/strangelove-ventures/heighliner) to enable [interchaintest](https://github.com/strangelove-ventures/interchaintest).
+
 ## [v1.0.0](https://github.com/KYVENetwork/chain/releases/tag/v1.0.0) - 2023-03-10
 
 Release for the KYVE network launch.
 
 ## [v1.0.0-rc1](https://github.com/KYVENetwork/chain/releases/tag/v1.0.0-rc1) - 2023-03-07
 
-Second `v1.0.0` release candidate for a Kaon network upgrade.
+`v1.0.0` Release Candidate for a Kaon network upgrade.
 
 ### Improvements
 
 - (deps) [#3](https://github.com/KYVENetwork/chain/pull/3), [#7](https://github.com/KYVENetwork/chain/pull/7) Bump Cosmos SDK to [v0.46.10](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.10) ([`v0.46.10-kyve-rc0`](https://github.com/KYVENetwork/cosmos-sdk/releases/tag/v0.46.10-kyve-rc0)).
 - (deps) [#3](https://github.com/KYVENetwork/chain/pull/3) Bump IBC to [v6.1.0](https://github.com/cosmos/ibc-go/releases/tag/v6.1.0).
 - (deps) [#7](https://github.com/KYVENetwork/chain/pull/7) Bump Tendermint to [v0.34.26](https://github.com/informalsystems/tendermint/releases/tag/v0.34.26).
-- (`x/team`) [#7](https://github.com/KYVENetwork/chain/pull/7) Switched to a co-minting approach.
+- (`x/team`) [#7](https://github.com/KYVENetwork/chain/pull/7) Switch to a co-minting approach.
 
 ### State Machine Breaking
 
diff --git a/Makefile b/Makefile
index b0da6c4a..5a1da5ab 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,8 @@ else
 $(info 📑 Using default environment...)
 endif
 
-ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=kyve \
+ldflags := $(LDFLAGS)
+ldflags += -X github.com/cosmos/cosmos-sdk/version.Name=kyve \
 		  -X github.com/cosmos/cosmos-sdk/version.AppName=kyved \
 		  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
 		  -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
@@ -25,6 +26,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=kyve \
 		  -X github.com/KYVENetwork/chain/x/team/types.TEAM_BCP_STRING=$(TEAM_BCP_ADDRESS) \
 		  -X github.com/KYVENetwork/chain/x/team/types.TEAM_ALLOCATION_STRING=$(TEAM_ALLOCATION) \
 		  -X github.com/KYVENetwork/chain/x/team/types.TGE_STRING=$(TEAM_TGE)
+ldflags := $(strip $(ldflags))
 
 BUILD_FLAGS := -ldflags '$(ldflags)' -tags 'ledger' -trimpath
 
@@ -136,6 +138,22 @@ proto-setup:
 ###                           Tests & Simulation                            ###
 ###############################################################################
 
+heighliner:
+	@echo "🤖 Building Kaon image..."
+	@heighliner build --chain kaon --local 1> /dev/null
+	@echo "✅ Completed build!"
+
+	@echo "🤖 Building KYVE image..."
+	@heighliner build --chain kyve --local 1> /dev/null
+	@echo "✅ Completed build!"
+
+heighliner-setup:
+	@echo "🤖 Installing Heighliner..."
+	@git clone https://github.com/strangelove-ventures/heighliner.git
+	@cd heighliner && go install && cd ..
+	@rm -rf heighliner
+	@echo "✅ Completed installation!"
+
 test:
 	@echo "🤖 Running tests..."
 	@go test -cover -mod=readonly ./x/...