diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58c5cc0e9c..73c55939de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 * [CHANGE] Query Frontend/Ruler: Omit empty data, errorType and error fields in API response. #5953 #5954
 * [ENHANCEMENT] Ingester: Added `upload_compacted_blocks_enabled` config to ingester to parameterize uploading compacted blocks. #5959
+* [BUGFIX] Querier: Select correct tenant during query federation. #5943
 
 ## 1.17.0 2024-04-30
 
diff --git a/VERSION b/VERSION
index 092afa15df..511a76e6fa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.17.0
+1.17.1