diff --git a/.goreleaser.yml b/.goreleaser.yml
index 897eeeffba..d91039179e 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -82,6 +82,8 @@ nfpms:
       rpm:
         replacements:
           amd64: x86_64
+          arm64: aarch64
+          armhf: armv7hl
         file_name_template: "influxdb2-nightly.{{ .Arch }}"
       deb:
         file_name_template: "influxdb2-nightly-{{ .Arch }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 503ad642e2..f2fc3b0ff5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ This release adds an embedded SQLite database for storing metadata required by t
 1. [21648](https://github.com/influxdata/influxdb/pull/21648): Change static legend's `hide` to `show` to let users decide if they want it.
 1. [21662](https://github.com/influxdata/influxdb/pull/21662): Do not close connection twice in DigestWithOptions
 1. [21691](https://github.com/influxdata/influxdb/pull/21691): Remove incorrect optimization for group-by
+1. [21747](https://github.com/influxdata/influxdb/pull/21747): Rename arm rpms with yum-compatible names
 
 ## v2.0.7 [2021-06-04]