diff --git a/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf b/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf
index cb056113..7e80215e 100644
--- a/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf
+++ b/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf
@@ -48,6 +48,7 @@ resource "btp_subaccount_entitlement" "cloudfoundry" {
 }
 
 resource "btp_subaccount_environment_instance" "cloudfoundry" {
+  depends_on       = [btp_subaccount_entitlement.build_code]
   subaccount_id    = btp_subaccount.dc_mission.id
   name             = "cf-${random_uuid.uuid.result}"
   environment_type = "cloudfoundry"
@@ -204,7 +205,7 @@ resource "local_file" "output_vars_step1" {
       cf_org_id            = "${jsondecode(btp_subaccount_environment_instance.cloudfoundry.labels)["Org ID"]}"
       cf_org_name          = "${jsondecode(btp_subaccount_environment_instance.cloudfoundry.labels)["Org Name"]}"
 
-      origin               = "${var.origin}"
+      origin_key           = "${var.origin}"
 
       cf_space_name        = "${var.cf_space_name}"
 
diff --git a/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf b/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf
index 938ea1d6..7ea8a9e0 100644
--- a/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf
+++ b/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf
@@ -16,17 +16,25 @@ resource "cloudfoundry_space" "dev" {
 # ------------------------------------------------------------------------------------------------------
 # Assign CF Org roles to the admin users
 # ------------------------------------------------------------------------------------------------------
+# Remove current user from org roles
+data "btp_whoami" "me" {}
+
+locals {
+  cf_org_admins = setsubtract(toset(var.cf_org_admins), [data.btp_whoami.me.email])
+}
+
 # Define Org User role
 resource "cloudfoundry_org_role" "organization_user" {
-  for_each = toset("${var.cf_org_admins}")
+  for_each = toset(local.cf_org_admins)
   username = each.value
   type     = "organization_user"
   org      = var.cf_org_id
   origin   = var.origin_key
 }
+
 # Define Org Manager role
 resource "cloudfoundry_org_role" "organization_manager" {
-  for_each   = toset("${var.cf_org_admins}")
+  for_each   = toset(local.cf_org_admins)
   username   = each.value
   type       = "organization_manager"
   org        = var.cf_org_id