diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index bedc75f1f52..6892d116b0a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,17 +12,10 @@ are the most critical to review.
 
 closes: #XXXX
 
+<!-- Please refer to the [guidelines](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#commit-messages) for commit messages in ibc-go.
 
-### Commit Message / Changelog Entry
+This repository uses [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/).
 
-```text
-type: commit message
-```
-
-see the [guidelines](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#commit-messages) for commit messages. (view raw markdown for examples)
-
-
-<!--
 Example commit messages:
 
 fix: skip emission of unpopulated memo field in ics20
@@ -42,11 +35,12 @@ checked off. If any of the checklist items are not applicable, please leave them
 write a little note why.
 
 - [ ] Targeted PR against the correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#pull-request-targeting)).
-- [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
+- [ ] Linked to GitHub issue with discussion and accepted design, OR link to spec that describes this work.
 - [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/build/building-modules/11-structure.md) and [Go style guide](../docs/dev/go-style-guide.md).
 - [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/main/testing/README.md#ibc-testing-package).
-- [ ] Updated relevant documentation (`docs/`) or specification (`x/<module>/spec/`).
+- [ ] Updated relevant documentation (`docs/`).
 - [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code).
-- [ ] Provide a [commit message](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#commit-messages) to be used for the changelog entry in the PR description for review.
-- [ ] Re-reviewed `Files changed` in the Github PR explorer.
+- [ ] Provide a [conventional commit message](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#commit-messages) to follow the repository standards.
+- [ ] Include a descriptive changelog entry when appropriate. This may be left to the discretion of the PR reviewers. (e.g. chores should be omitted from changelog)
+- [ ] Re-reviewed `Files changed` in the GitHub PR explorer.
 - [ ] Review `Codecov Report` in the comment section below once CI passes.
diff --git a/Makefile b/Makefile
index 96bc12dda24..6ff6bc42ece 100644
--- a/Makefile
+++ b/Makefile
@@ -167,10 +167,6 @@ build-docs:
 serve-docs:
 	@cd docs && npm run serve
 
-#? changelog: Show changelog
-changelog:
-	docker run --rm -v "$$(pwd)"/.git:/app/ -v "$$(pwd)/cliff.toml":/app/cliff.toml orhunp/git-cliff:latest --unreleased --tag $(tag)
-
 # If the DOCS_VERSION variable is not set, display an error message and exit
 ifndef DOCS_VERSION
 #? tag-docs-version: Tag the docs version
diff --git a/cliff.toml b/cliff.toml
deleted file mode 100644
index da5a41a196f..00000000000
--- a/cliff.toml
+++ /dev/null
@@ -1,119 +0,0 @@
-# configuration file for git-cliff (0.1.0)
-
-[changelog]
-# changelog header
-header = """
-<!--
-Usage:
-
-Change log entries are generated by git cliff ref: https://github.com/orhun/git-cliff
-This can be run using "make changelog tag=vx.y.z"
-
-Each commit should be conventional, the following message groups are supported.
-
-* feat, feature
-* imp
-* bug, fix
-* deprecated
-* (api)!
-* (statemachine)!
-
-Types of changes (Stanzas):
-
-"Features" for new features. (feat, feature)
-"Improvements" for changes in existing functionality. (imp)
-"Deprecated" for soon-to-be removed features.
-"Bug Fixes" for any bug fixes. (bug, fix)
-"API Breaking" for breaking exported APIs used by developers building on SDK. Add (api)! e.g. fix(api)!: api breaking fix
-"State Machine Breaking" for any changes that result in a different AppState given the same genesisState and txList. Add (statemachine)! e.g. fix(statemachine)!: state machine breaking fix
-Ref: https://keepachangelog.com/en/1.0.0/
--->
-
-# Changelog
-All notable changes to this project will be documented in this file.
-"""
-# template for the changelog body
-# https://tera.netlify.app/docs/#introduction
-body = """
-{% if version %}\
-    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
-{% else %}\
-    ## [unreleased]
-{% endif %}\
-{% for group, commits in commits | group_by(attribute="group") %}
-    ### {{ group | striptags | trim | upper_first }}
-    {% for commit in commits %}
-        * {{ commit.message | upper_first }}\
-    {% endfor %}
-{% endfor %}\n
-"""
-# remove the leading and trailing whitespace from the template
-trim = true
-# changelog footer
-footer = """
-<!-- generated by git-cliff -->
-"""
-
-[git]
-# parse the commits based on https://www.conventionalcommits.org
-conventional_commits = true
-# filter out the commits that are not conventional
-filter_unconventional = true
-# process each line of a commit as an individual commit
-split_commits = true
-# regex for preprocessing the commit messages
-commit_preprocessors = [
-    # A reference to an issue is appended to commits that looks like "(#1234)", this will be replaced
-    # with a link to that issue, e.g. "[#$1234](https://github.com/cosmos/ibc-go/issues/1234)".
-    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/cosmos/ibc-go/issues/${2}))" },
-    # any reference to a pr like "pr-1234" will be replaced with a link to the PR.
-    { pattern = '\(pr-([0-9]+)\)', replace = "([#${1}](https://github.com/cosmos/ibc-go/pulls/${1}))" },
-
-    # the following patterns only exist because "split_commits" is set to true, and we are processesing
-    # each line of the commit as a separate message.
-    # these exist to filter out common messages that appear in commit messages that are technically
-    # conventional, but we do not way to include in the changelog.
-    { pattern = '^Signed-off-by:.*', replace='' },
-    { pattern = '^Co-authored-by:.*', replace='' },
-    # don't include references to issues as changelog entries.
-    { pattern = '^ref:.*', replace='' },
-    # exclude CVSS format, CVE can still be included in regular conventinal commits.
-    { pattern = 'CVSS:.*', replace='' },
-    # don't include dependabot auto merge entries.
-    { pattern = '.*dependabot-automerge-.*', replace='' },
-    # don't include statements saying which issue is closed.
-    { pattern = '^closes:.*', replace='' },
-    # remove standalone links in the commit messages.
-    { pattern = '^https://.*', replace='' },
-    # remove lines with html.
-    { pattern = '^<.*', replace='' },
-]
-
-# regex for parsing and grouping commits
-commit_parsers = [
-    # specifying the number in a comment is a workaround to enable ordering of groups.
-    # these comments are stripped out of the markdown with the filter "{{ group | striptags | trim | upper_first }}"
-    # above in the body template.
-    { message = "^((?i)deps|(?i)dep|(?i)build)", group = "<!-- 0 -->Dependencies" },
-    { message = '^.*\(api\)!', group = "<!-- 1 -->API Breaking" },
-    { message = '^.*\(statemachine\)!', group = "<!-- 2 -->State Machine Breaking" },
-    { message = "^((?i)improvements|(?i)imp)", group = "<!-- 3 -->Improvements" },
-    { message = "^((?i)feature|(?i)feat)", group = "<!-- 4 -->Features" },
-    { message = "^((?i)fix|(?i)bug)", group = "<!-- 5 -->Bug Fixes" },
-    { message = "^((?i)doc|(?i)docs|(?i)documentation)", group = "<!-- 6 -->Documentation" },
-    { message = "^((?i)test|(?i)e2e)", group = "<!-- 7 -->Testing" },
-    { message = "^((?i)deprecated)", group = "<!-- 8 -->Deprecated" },
-    { message = "^((?i)chore|(?i)misc|(?i)nit)", group = "<!-- 9 -->Miscellaneous Tasks" },
-]
-# filter out the commits that are not matched by commit parsers
-filter_commits = false
-# glob pattern for matching git tags
-tag_pattern = "v[0-9]*"
-# regex for skipping tags
-skip_tags = ""
-# regex for ignoring tags
-ignore_tags = ""
-# sort the tags chronologically
-date_order = false
-# sort the commits inside sections by oldest/newest order
-sort_commits = "oldest"