diff --git a/prepare_aws_enviroment.sh b/prepare_aws_enviroment.sh
index 550b71bf6..4faab3e58 100644
--- a/prepare_aws_enviroment.sh
+++ b/prepare_aws_enviroment.sh
@@ -52,7 +52,7 @@ echo "Subnet is now correctly configured."
 
 # Create Elastic Container Registry (ECR)
 echo "Creating Elastic Container Registry (ECR)..."
-ECR_REPO_URI=$(aws ecr create-repository --repository-name "$ECR_NAME" --region "$REGION" --query 'repository.repositoryUri' --output text)
+ECR_REPO_URI=$(aws ecr create-repository --repository-name "$ECR_NAME" -tags Key=Name,Value="$ECR_NAME" Key=Owner,Value="$OWNER" Key=Project,Value="$PROJECT" --region "$REGION" --query 'repository.repositoryUri' --output text)
 
 export ECR_REPO_URI
 
@@ -62,10 +62,6 @@ if [ -z "$ECR_REPO_URI" ]; then
 fi
 echo "ECR repository created: $ECR_REPO_URI"
 
-# Add tags to ECR repository
-aws ecr create-repository --repository-name "$ECR_NAME" --tags Key=Name,Value="$ECR_NAME" Key=Owner,Value="$OWNER" Key=Project,Value="$PROJECT" --region "$REGION"
-echo "ECR repository is now correctly configured."
-
 # Create Security Group
 echo "Creating Security Group..."
 SECURITY_GROUP_ID=$(aws ec2 create-security-group --group-name "$SECURITY_GROUP_NAME" --description "Security group for devOps internship assesment" --vpc-id "$VPC_ID" --region "$REGION" --output text)