diff --git a/octopus-samples-instances/aws-base-infrastructure-terraform/rds.tf b/octopus-samples-instances/aws-base-infrastructure-terraform/rds.tf
index ee3b029..7720491 100644
--- a/octopus-samples-instances/aws-base-infrastructure-terraform/rds.tf
+++ b/octopus-samples-instances/aws-base-infrastructure-terraform/rds.tf
@@ -15,6 +15,16 @@ resource "aws_db_parameter_group" "solutions_mariadb" {
     name  = "character_set_client"
     value = "utf8"
   }
+
+  parameter {
+    name = "character_set_connection"
+    value = "utf8"
+  }
+
+  parameter {
+    name = "character_set_database"
+    value = "utf8"
+  }
 }
 
 resource "aws_db_instance" "mariadb_rds_instance" {
@@ -43,6 +53,16 @@ resource "aws_db_parameter_group" "solutions_mysql" {
     name  = "character_set_client"
     value = "utf8"
   }
+
+  parameter {
+    name = "character_set_connection"
+    value = "utf8"
+  }
+
+  parameter {
+    name = "character_set_database"
+    value = "utf8"
+  }  
 }
 
 resource "aws_db_instance" "mysql_rds_instance" {