diff --git a/aws-fargate-terraform/codepipeline.tf b/aws-fargate-terraform/codepipeline.tf
index b5357d90..fac69740 100644
--- a/aws-fargate-terraform/codepipeline.tf
+++ b/aws-fargate-terraform/codepipeline.tf
@@ -4,23 +4,23 @@ provider "github" {
 }
 
 resource "aws_ecr_repository" "cdc" {
-  name = "${var.prefix}-cdc"
+  name = "${var.prefix}-cdc-service"
 }
 
 resource "aws_ecr_repository" "customer" {
-  name = "${var.prefix}-customer"
+  name = "${var.prefix}-customer-service"
 }
 
 resource "aws_ecr_repository" "order" {
-  name = "${var.prefix}-order"
+  name = "${var.prefix}-order-service"
 }
 
 resource "aws_ecr_repository" "orderhistory" {
-  name = "${var.prefix}-orderhistory"
+  name = "${var.prefix}-orderhistory-service"
 }
 
 resource "aws_s3_bucket" "source" {
-  bucket        = "${var.prefix}-evntuate-source"
+  bucket        = "${var.prefix}-eventuate-source"
   acl           = "private"
   force_destroy = true
 }
diff --git a/aws-fargate-terraform/kafka.tf b/aws-fargate-terraform/kafka.tf
index 00c364d0..4eb126b2 100644
--- a/aws-fargate-terraform/kafka.tf
+++ b/aws-fargate-terraform/kafka.tf
@@ -36,7 +36,7 @@ resource "aws_msk_cluster" "eventuate" {
 
 resource "aws_msk_configuration" "msk" {
   kafka_versions = ["2.1.0"]
-  name           = "dev-example"
+  name           = "${var.prefix}-example"
 
   server_properties = <<PROPERTIES
 auto.create.topics.enable = true