diff --git a/released/discovery_center/mission_3061/step2/main.tf b/released/discovery_center/mission_3061/step2/main.tf
index 5c121359..e28d76cc 100644
--- a/released/discovery_center/mission_3061/step2/main.tf
+++ b/released/discovery_center/mission_3061/step2/main.tf
@@ -102,18 +102,18 @@ resource "cloudfoundry_service_instance" "abap_si" {
 ###
 # Creation of service key for ABAP Development Tools (ADT)
 ###
-resource "cloudfoundry_service_credential_binding" "scb1" {
+resource "cloudfoundry_service_credential_binding" "abap_adt_key" {
   type             = "key"
-  name             = "${var.abap_sid}_adtkey"
+  name             = "${var.abap_sid}_adt_key"
   service_instance = cloudfoundry_service_instance.abap_si.id
 }
 
 ###
 # Creation of service key for COMM Arrangement
 ###
-resource "cloudfoundry_service_credential_binding" "abap_ipskey" {
+resource "cloudfoundry_service_credential_binding" "abap_ips_key" {
   type             = "key"
-  name             = "${var.abap_sid}_ipskey"
+  name             = "${var.abap_sid}_ips_key"
   service_instance = cloudfoundry_service_instance.abap_si.id
   parameters = jsonencode({
     scenario_id = "SAP_COM_0193"
diff --git a/released/discovery_center/mission_3061/step2/outputs.tf b/released/discovery_center/mission_3061/step2/outputs.tf
new file mode 100644
index 00000000..411cc48b
--- /dev/null
+++ b/released/discovery_center/mission_3061/step2/outputs.tf
@@ -0,0 +1,19 @@
+output "abab_service_instance_id" {
+  value       = cloudfoundry_service_instance.abap_si.id
+  description = "The ID of the ABAP service instance."
+}
+
+output "abap_dashboard_url" {
+  value       = cloudfoundry_service_instance.abap_si.dashboard_url
+  description = "The URL of the ABAP service instance dashboard."
+}
+
+output "abab_adt_key_id" {
+  value       = cloudfoundry_service_credential_binding.abap_adt_key.id
+  description = "The ID of the ABAP service key for ADT."
+}
+
+output "abab_ips_key_id" {
+  value       = cloudfoundry_service_credential_binding.abap_ips_key.id
+  description = "The ID of the ABAP service key for COMM Arrangement."
+}
diff --git a/released/discovery_center/mission_3248_trial/step2/outputs.tf b/released/discovery_center/mission_3248_trial/step2/outputs.tf
index d936e454..1c37d5e7 100644
--- a/released/discovery_center/mission_3248_trial/step2/outputs.tf
+++ b/released/discovery_center/mission_3248_trial/step2/outputs.tf
@@ -3,6 +3,11 @@ output "abab_trial_service_instance_id" {
   description = "The ID of the ABAP service instance."
 }
 
+output "abap_trial_dashboard_url" {
+  value       = cloudfoundry_service_instance.abap_trial.dashboard_url
+  description = "The URL of the ABAP Trial dashboard."
+}
+
 output "abab_trial_service_key_id" {
   value       = cloudfoundry_service_credential_binding.abap_trial_service_key.id
   description = "The ID of the ABAP service key."