diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cbc9c2..29cf9ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [5.0.5] - 2024-08-21
+### Fixed
+- Add `copy_tags_to_snapshot` to aws_rds_cluster.
+
 ## [5.0.4] - 2024-06-05
 ### Changed
 - Change kiam auth method to irsa for metadata cleanup, path cleanup and scheduler apiary
diff --git a/rds.tf b/rds.tf
index b99bd86..b4dab19 100644
--- a/rds.tf
+++ b/rds.tf
@@ -67,5 +67,6 @@ resource "aws_db_instance" "beekeeper" {
   apply_immediately            = var.db_apply_immediately
   performance_insights_enabled = var.db_performance_insights_enabled
   final_snapshot_identifier    = "${local.instance_alias}-final-snapshot-${random_id.snapshot_id.hex}"
+  copy_tags_to_snapshot        = var.db_copy_tags_to_snapshot
   tags                         = var.beekeeper_tags
 }
diff --git a/variables.tf b/variables.tf
index 2963a83..65996e9 100644
--- a/variables.tf
+++ b/variables.tf
@@ -564,3 +564,9 @@ variable "slack_webhook_url" {
   default     = ""
   type        = string
 }
+
+variable "db_copy_tags_to_snapshot" {
+    description = "Copy all Cluster tags to snapshots."
+    type        = bool
+    default     = true
+}