diff --git a/released/discovery_center/mission_3585/main.tf b/released/discovery_center/mission_3585/main.tf
index 51e93ec1..051192d4 100644
--- a/released/discovery_center/mission_3585/main.tf
+++ b/released/discovery_center/mission_3585/main.tf
@@ -13,43 +13,6 @@ resource "btp_subaccount" "dc_mission" {
   region    = lower(var.region)
 }
 
-# ------------------------------------------------------------------------------------------------------
-# SERVICES
-# ------------------------------------------------------------------------------------------------------
-#
-locals {
-  # optional
-  service_name__cicd_service = "cicd-service"
-}
-# ------------------------------------------------------------------------------------------------------
-# Setup cicd-service (SAP Continuous Integration and Delivery), (not running in CF environment)
-# ------------------------------------------------------------------------------------------------------
-# Entitle 
-resource "btp_subaccount_entitlement" "cicd_service" {
-  count         = var.use_optional_resources ? 1 : 0
-  subaccount_id = btp_subaccount.dc_mission.id
-  service_name  = local.service_name__cicd_service
-  plan_name     = var.service_plan__cicd_service
-}
-# Get serviceplan_id for cicd-service with plan_name "default"
-data "btp_subaccount_service_plan" "cicd_service" {
-  count         = var.use_optional_resources ? 1 : 0
-  subaccount_id = btp_subaccount.dc_mission.id
-  offering_name = local.service_name__cicd_service
-  name          = var.service_plan__cicd_service
-  depends_on    = [btp_subaccount_entitlement.cicd_service]
-}
-# Create service instance
-resource "btp_subaccount_service_instance" "cicd_service" {
-  count          = var.use_optional_resources ? 1 : 0
-  subaccount_id  = btp_subaccount.dc_mission.id
-  serviceplan_id = data.btp_subaccount_service_plan.cicd_service[0].id
-  name           = "default_cicd-service"
-  # Subscription to the cicd-app subscription is required for creating the service instance
-  # See as well https://help.sap.com/docs/continuous-integration-and-delivery/sap-continuous-integration-and-delivery/optional-enabling-api-usage?language=en-US
-  depends_on = [btp_subaccount_subscription.cicd_app]
-}
-
 # ------------------------------------------------------------------------------------------------------
 # APP SUBSCRIPTIONS
 # ------------------------------------------------------------------------------------------------------
diff --git a/released/discovery_center/mission_3585/outputs.tf b/released/discovery_center/mission_3585/outputs.tf
index bcad8672..beb614dc 100644
--- a/released/discovery_center/mission_3585/outputs.tf
+++ b/released/discovery_center/mission_3585/outputs.tf
@@ -13,10 +13,6 @@ output "sap_launchpad_subscription_url" {
   description = "SAP Build Work Zone, standard edition subscription URL."
 }
 
-output "cicd_service_id" {
-  value = var.use_optional_resources ? btp_subaccount_service_instance.cicd_service[0].id : null
-}
-
 output "cicd_app_subscription_url" {
   value       = var.use_optional_resources ? btp_subaccount_subscription.cicd_app[0].subscription_url : null
   description = "Continuous Integration & Delivery subscription URL."
diff --git a/released/discovery_center/mission_3585/variables.tf b/released/discovery_center/mission_3585/variables.tf
index 6b0f716d..e1b995ea 100644
--- a/released/discovery_center/mission_3585/variables.tf
+++ b/released/discovery_center/mission_3585/variables.tf
@@ -36,19 +36,6 @@ variable "use_optional_resources" {
   default     = true
 }
 
-# ------------------------------------------------------------------------------------------------------
-# service plans
-# ------------------------------------------------------------------------------------------------------
-variable "service_plan__cicd_service" {
-  type        = string
-  description = "The plan for service 'SAP Continuous Integration and Delivery' with technical name 'cicd-service'"
-  default     = "default"
-  validation {
-    condition     = contains(["default"], var.service_plan__cicd_service)
-    error_message = "Invalid value for service_plan__cicd_service. Only 'default' is allowed."
-  }
-}
-
 # ------------------------------------------------------------------------------------------------------
 # app subscription plans
 # ------------------------------------------------------------------------------------------------------