diff --git a/s3-config-org/sns.s3.tf b/s3-config-org/sns.s3.tf
index 0ef5c49..624745d 100644
--- a/s3-config-org/sns.s3.tf
+++ b/s3-config-org/sns.s3.tf
@@ -1,7 +1,7 @@
 resource "aws_sns_topic" "config_org_s3" {
   count             = var.enable_s3_sns ? 1 : 0
   name              = local.s3_notification_name
-  kms_master_key_id = data.aws_kms_key.incoming_key.id
+  kms_master_key_id = aws_kms_key.key.id
 
   tags = merge(
     local.base_tags,
diff --git a/s3-config-org/sqs.s3.tf b/s3-config-org/sqs.s3.tf
index 2cb2d6c..4cf6201 100644
--- a/s3-config-org/sqs.s3.tf
+++ b/s3-config-org/sqs.s3.tf
@@ -9,7 +9,7 @@ resource "aws_sqs_queue" "config_org_s3_deadletter" {
   receive_wait_time_seconds  = 15
   visibility_timeout_seconds = 3600
 
-  kms_master_key_id                 = data.aws_kms_key.incoming_key.id
+  kms_master_key_id                 = aws_kms_key.key.id
   kms_data_key_reuse_period_seconds = 300
 
   tags = merge(
@@ -60,7 +60,7 @@ resource "aws_sqs_queue" "config_org_s3" {
     maxReceiveCount     = 100
   })
 
-  kms_master_key_id                 = data.aws_kms_key.incoming_key.id
+  kms_master_key_id                 = aws_kms_key.key.id
   kms_data_key_reuse_period_seconds = 300
 
   tags = merge(