diff --git a/ibm_catalog.json b/ibm_catalog.json
index 4e26f1f9..3ce709ed 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -351,6 +351,12 @@
             {
               "key": "enable_kibana_dashboard"
             },
+            {
+              "key": "kibana_code_engine_new_project_name"
+            },
+            {
+              "key": "kibana_code_engine_new_app_name"
+            },
             {
               "key": "existing_code_engine_project_id"
             },
diff --git a/solutions/standard/main.tf b/solutions/standard/main.tf
index 56e96915..c755526b 100644
--- a/solutions/standard/main.tf
+++ b/solutions/standard/main.tf
@@ -435,8 +435,8 @@ module "secrets_manager_service_credentials" {
 
 locals {
   code_engine_project_id   = var.existing_code_engine_project_id != null ? var.existing_code_engine_project_id : null
-  code_engine_project_name = local.code_engine_project_id != null ? null : (var.prefix != null && var.prefix != "") ? "${var.prefix}-code-engine-kibana-project" : "ce-kibana-project"
-  code_engine_app_name     = (var.prefix != null && var.prefix != "") ? "${var.prefix}-kibana-app" : "ce-kibana-app"
+  code_engine_project_name = local.code_engine_project_id != null ? null : (var.prefix != null && var.prefix != "") ? "${var.prefix}-${var.kibana_code_engine_new_project_name}" : var.kibana_code_engine_new_project_name
+  code_engine_app_name     = (var.prefix != null && var.prefix != "") ? "${var.prefix}-${var.kibana_code_engine_new_app_name}" : var.kibana_code_engine_new_app_name
   kibana_version           = var.enable_kibana_dashboard ? jsondecode(data.http.es_metadata[0].response_body).version.number : null
 }
 
diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf
index a60b7a41..6c7f985e 100644
--- a/solutions/standard/variables.tf
+++ b/solutions/standard/variables.tf
@@ -350,6 +350,18 @@ variable "admin_pass_secrets_manager_secret_name" {
 # Kibana Configuration
 ##############################################################
 
+variable "kibana_code_engine_new_project_name" {
+  type        = string
+  description = "The Code Engine project name. If a prefix input variable is specified, the prefix is added to the name in the `<prefix>-<name>` format."
+  default     = "ce-kibana-project"
+}
+
+variable "kibana_code_engine_new_app_name" {
+  type        = string
+  description = "The Code Engine application name. If a prefix input variable is specified, the prefix is added to the name in the `<prefix>-<name>` format."
+  default     = "ce-kibana-app"
+}
+
 variable "existing_code_engine_project_id" {
   type        = string
   description = "Existing code engine project ID to deploy Kibana. If no value is passed, a new code engine project will be created."