diff --git a/released/SAP-Inside-Tracks/SITBLR2024/provider.tf b/released/SAP-Inside-Tracks/SITBLR2024/provider.tf
index c044517b..8babc224 100644
--- a/released/SAP-Inside-Tracks/SITBLR2024/provider.tf
+++ b/released/SAP-Inside-Tracks/SITBLR2024/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.7.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/discovery_center/mission_3348/provider.tf b/released/discovery_center/mission_3348/provider.tf
index 29e1fdd8..386d3a59 100644
--- a/released/discovery_center/mission_3348/provider.tf
+++ b/released/discovery_center/mission_3348/provider.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.6.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/discovery_center/mission_3488/step1/provider.tf b/released/discovery_center/mission_3488/step1/provider.tf
index 810dc107..b7a886a6 100644
--- a/released/discovery_center/mission_3488/step1/provider.tf
+++ b/released/discovery_center/mission_3488/step1/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "SAP/btp"
-      version = "~> 1.7.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/discovery_center/mission_3488/step2/provider.tf b/released/discovery_center/mission_3488/step2/provider.tf
index 75f1118b..99450039 100644
--- a/released/discovery_center/mission_3488/step2/provider.tf
+++ b/released/discovery_center/mission_3488/step2/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "SAP/btp"
-      version = "~> 1.7.0"
+      version = "~> 1.8.0"
     }
     cloudfoundry = {
       source  = "SAP/cloudfoundry"
diff --git a/released/discovery_center/mission_3945/provider.tf b/released/discovery_center/mission_3945/provider.tf
index 29e1fdd8..386d3a59 100644
--- a/released/discovery_center/mission_3945/provider.tf
+++ b/released/discovery_center/mission_3945/provider.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.6.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/discovery_center/mission_4033/step1/provider.tf b/released/discovery_center/mission_4033/step1/provider.tf
index c55ef6c8..98fed2f3 100644
--- a/released/discovery_center/mission_4033/step1/provider.tf
+++ b/released/discovery_center/mission_4033/step1/provider.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.6.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/discovery_center/mission_4033/step2/provider.tf b/released/discovery_center/mission_4033/step2/provider.tf
index f10f869c..3ad7760a 100644
--- a/released/discovery_center/mission_4033/step2/provider.tf
+++ b/released/discovery_center/mission_4033/step2/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "SAP/btp"
-      version = "~> 1.6.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/discovery_center/mission_4172/step1/provider.tf b/released/discovery_center/mission_4172/step1/provider.tf
index 9dd731a0..b301441e 100644
--- a/released/discovery_center/mission_4172/step1/provider.tf
+++ b/released/discovery_center/mission_4172/step1/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "SAP/btp"
-      version = "1.5.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/discovery_center/mission_4327/step1/provider.tf b/released/discovery_center/mission_4327/step1/provider.tf
index 2fb0e38f..9e7b85fd 100644
--- a/released/discovery_center/mission_4327/step1/provider.tf
+++ b/released/discovery_center/mission_4327/step1/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "SAP/btp"
-      version = "~> 1.7.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/discovery_center/mission_4327/step2_cf/provider.tf b/released/discovery_center/mission_4327/step2_cf/provider.tf
index a1645b26..12f609a1 100644
--- a/released/discovery_center/mission_4327/step2_cf/provider.tf
+++ b/released/discovery_center/mission_4327/step2_cf/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "SAP/btp"
-      version = "~> 1.7.0"
+      version = "~> 1.8.0"
     }
     cloudfoundry = {
       source  = "SAP/cloudfoundry"
diff --git a/released/discovery_center/mission_4356/step1/provider.tf b/released/discovery_center/mission_4356/step1/provider.tf
index 9dd731a0..b301441e 100644
--- a/released/discovery_center/mission_4356/step1/provider.tf
+++ b/released/discovery_center/mission_4356/step1/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "SAP/btp"
-      version = "1.5.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/discovery_center/mission_4371/step1/provider.tf b/released/discovery_center/mission_4371/step1/provider.tf
index 532a1be2..e039eb26 100644
--- a/released/discovery_center/mission_4371/step1/provider.tf
+++ b/released/discovery_center/mission_4371/step1/provider.tf
@@ -5,7 +5,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.6.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/discovery_center/mission_4371/step2/provider.tf b/released/discovery_center/mission_4371/step2/provider.tf
index ebed9fd7..170b2c1f 100644
--- a/released/discovery_center/mission_4371/step2/provider.tf
+++ b/released/discovery_center/mission_4371/step2/provider.tf
@@ -6,7 +6,7 @@ terraform {
     }
     btp = {
       source  = "SAP/btp"
-      version = "~> 1.6.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/modules/btp-cf/btp-cf-env-instance/btp_env_cf.tf b/released/modules/btp-cf/btp-cf-env-instance/btp_env_cf.tf
index 92067e3e..35ad1728 100644
--- a/released/modules/btp-cf/btp-cf-env-instance/btp_env_cf.tf
+++ b/released/modules/btp-cf/btp-cf-env-instance/btp_env_cf.tf
@@ -4,8 +4,8 @@
 terraform {
   required_providers {
     btp = {
-      source  = "sap/btp"
-      version = "1.5.0"
+      source  = "SAP/btp"
+      version = "~> 1.8.0"
     }
     cloudfoundry = {
       source  = "SAP/cloudfoundry"
diff --git a/released/usecases/cf_enable_application_runtime_memory/provider.tf b/released/usecases/cf_enable_application_runtime_memory/provider.tf
index 18c74094..5bc5910d 100644
--- a/released/usecases/cf_enable_application_runtime_memory/provider.tf
+++ b/released/usecases/cf_enable_application_runtime_memory/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "1.7.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/usecases/dev_test_prod_setup/modules/subaccount_setup/subaccount_setup.tf b/released/usecases/dev_test_prod_setup/modules/subaccount_setup/subaccount_setup.tf
index d1f80ea4..0208b460 100644
--- a/released/usecases/dev_test_prod_setup/modules/subaccount_setup/subaccount_setup.tf
+++ b/released/usecases/dev_test_prod_setup/modules/subaccount_setup/subaccount_setup.tf
@@ -5,7 +5,7 @@ terraform {
   required_providers {
     btp = {
       source  = "SAP/btp"
-      version = "~> 1.7.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/usecases/dev_test_prod_setup/provider.tf b/released/usecases/dev_test_prod_setup/provider.tf
index a7e7a7a4..abb06729 100644
--- a/released/usecases/dev_test_prod_setup/provider.tf
+++ b/released/usecases/dev_test_prod_setup/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.7.0"
+      version = "~> 1.8.0"
     }
     cloudfoundry = {
       source  = "cloudfoundry/cloudfoundry"
diff --git a/released/usecases/multi_account_setup/modules/subaccount_setup/subaccount_setup.tf b/released/usecases/multi_account_setup/modules/subaccount_setup/subaccount_setup.tf
index d0bf8bc5..d8dc94af 100644
--- a/released/usecases/multi_account_setup/modules/subaccount_setup/subaccount_setup.tf
+++ b/released/usecases/multi_account_setup/modules/subaccount_setup/subaccount_setup.tf
@@ -5,7 +5,7 @@ terraform {
   required_providers {
     btp = {
       source  = "SAP/btp"
-      version = "1.5.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/usecases/multi_account_setup/provider.tf b/released/usecases/multi_account_setup/provider.tf
index 467f664c..d7b0f849 100644
--- a/released/usecases/multi_account_setup/provider.tf
+++ b/released/usecases/multi_account_setup/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "1.5.0"
+      version = "~> 1.8.0"
     }
     cloudfoundry = {
       source  = "SAP/cloudfoundry"
diff --git a/released/usecases/role_assignments/provider.tf b/released/usecases/role_assignments/provider.tf
index c1de5022..f4705aaa 100644
--- a/released/usecases/role_assignments/provider.tf
+++ b/released/usecases/role_assignments/provider.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.7.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/usecases/services_apps/sap_build_code/step1/provider.tf b/released/usecases/services_apps/sap_build_code/step1/provider.tf
index d1351409..a211aca0 100644
--- a/released/usecases/services_apps/sap_build_code/step1/provider.tf
+++ b/released/usecases/services_apps/sap_build_code/step1/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     btp = {
       source  = "SAP/btp"
-      version = "~> 1.5.0"
+      version = "~> 1.8.0"
     }
   }
 }
diff --git a/released/usecases/services_apps/sap_build_code/step2/main.tf b/released/usecases/services_apps/sap_build_code/step2/main.tf
index cc5cfd83..b8f5a105 100644
--- a/released/usecases/services_apps/sap_build_code/step2/main.tf
+++ b/released/usecases/services_apps/sap_build_code/step2/main.tf
@@ -20,15 +20,16 @@ resource "btp_subaccount_entitlement" "sdm" {
 }
 
 # Create the service instance
-data "cloudfoundry_service" "sdm" {
-  name       = "sdm"
-  depends_on = [btp_subaccount_entitlement.sdm]
+data "cloudfoundry_service_plans" "sdm" {
+  service_offering_name = "sdm"
+  name                  = "build-code"
+  depends_on            = [btp_subaccount_entitlement.sdm]
 }
 resource "cloudfoundry_service_instance" "sdm" {
   name         = "default_sdm"
   space        = cloudfoundry_space.dev.id
   type         = "managed"
-  service_plan = data.cloudfoundry_service.sdm.service_plans["build-code"]
+  service_plan = data.cloudfoundry_service_plans.sdm.service_plans[0].id
   depends_on   = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.sdm]
 }
 # Create service key
@@ -49,17 +50,19 @@ resource "btp_subaccount_entitlement" "mobile_services" {
   subaccount_id = var.subaccount_id
   service_name  = "mobile-services"
   plan_name     = "build-code"
+  amount        = 1
 }
 # Create the service instance
-data "cloudfoundry_service" "mobile_services" {
-  name       = "mobile-services"
-  depends_on = [btp_subaccount_entitlement.mobile_services]
+data "cloudfoundry_service_plans" "mobile_services" {
+  service_offering_name = "mobile-services"
+  name                  = "build-code"
+  depends_on            = [btp_subaccount_entitlement.mobile_services]
 }
 resource "cloudfoundry_service_instance" "mobile_services" {
   name         = "default_mobile-services"
   space        = cloudfoundry_space.dev.id
   type         = "managed"
-  service_plan = data.cloudfoundry_service.mobile_services.service_plans["build-code"]
+  service_plan = data.cloudfoundry_service_plans.mobile_services.service_plans[0].id
   depends_on   = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.mobile_services]
 }
 # Create service key
@@ -80,17 +83,19 @@ resource "btp_subaccount_entitlement" "cloud_logging" {
   subaccount_id = var.subaccount_id
   service_name  = "cloud-logging"
   plan_name     = "build-code"
+  amount        = "1"
 }
 # Create the service instance
-data "cloudfoundry_service" "cloud_logging" {
-  name       = "cloud-logging"
-  depends_on = [btp_subaccount_entitlement.cloud_logging]
+data "cloudfoundry_service_plans" "cloud_logging" {
+  service_offering_name = "cloud-logging"
+  name                  = "build-code"
+  depends_on            = [btp_subaccount_entitlement.cloud_logging]
 }
 resource "cloudfoundry_service_instance" "cloud_logging" {
   name         = "default_cloud-logging"
   space        = cloudfoundry_space.dev.id
   type         = "managed"
-  service_plan = data.cloudfoundry_service.cloud_logging.service_plans["build-code"]
+  service_plan = data.cloudfoundry_service_plans.cloud_logging.service_plans[0].id
   depends_on   = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.cloud_logging]
 }
 # Create service key
@@ -111,17 +116,19 @@ resource "btp_subaccount_entitlement" "alert_notification" {
   subaccount_id = var.subaccount_id
   service_name  = "alert-notification"
   plan_name     = "build-code"
+  amount        = "1"
 }
 # Create the service instance
-data "cloudfoundry_service" "alert_notification" {
-  name       = "alert-notification"
-  depends_on = [btp_subaccount_entitlement.alert_notification]
+data "cloudfoundry_service_plans" "alert_notification" {
+  service_offering_name = "alert-notification"
+  name                  = "build-code"
+  depends_on            = [btp_subaccount_entitlement.alert_notification]
 }
 resource "cloudfoundry_service_instance" "alert_notification" {
   name         = "default_alert-notification"
   space        = cloudfoundry_space.dev.id
   type         = "managed"
-  service_plan = data.cloudfoundry_service.alert_notification.service_plans["build-code"]
+  service_plan = data.cloudfoundry_service_plans.alert_notification.service_plans[0].id
   depends_on   = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.alert_notification]
 }
 # Create service key
@@ -144,15 +151,16 @@ resource "btp_subaccount_entitlement" "transport" {
   plan_name     = "standard"
 }
 # Create the service instance
-data "cloudfoundry_service" "transport" {
-  name       = "transport"
-  depends_on = [btp_subaccount_entitlement.transport]
+data "cloudfoundry_service_plans" "transport" {
+  service_offering_name = "transport"
+  name                  = "standard"
+  depends_on            = [btp_subaccount_entitlement.transport]
 }
 resource "cloudfoundry_service_instance" "transport" {
   name         = "default_transport"
   space        = cloudfoundry_space.dev.id
   type         = "managed"
-  service_plan = data.cloudfoundry_service.transport.service_plans["standard"]
+  service_plan = data.cloudfoundry_service_plans.transport.service_plans[0].id
   depends_on   = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.transport]
 }
 # Create service key
@@ -175,15 +183,16 @@ resource "btp_subaccount_entitlement" "autoscaler" {
   plan_name     = "standard"
 }
 # Create the service instance
-data "cloudfoundry_service" "autoscaler" {
-  name       = "autoscaler"
-  depends_on = [btp_subaccount_entitlement.autoscaler]
+data "cloudfoundry_service_plans" "autoscaler" {
+  service_offering_name = "autoscaler"
+  name                  = "standard"
+  depends_on            = [btp_subaccount_entitlement.autoscaler]
 }
 resource "cloudfoundry_service_instance" "autoscaler" {
   name         = "default_autoscaler"
   space        = cloudfoundry_space.dev.id
   type         = "managed"
-  service_plan = data.cloudfoundry_service.autoscaler.service_plans["standard"]
+  service_plan = data.cloudfoundry_service_plans.autoscaler.service_plans[0].id
   depends_on   = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.autoscaler]
 }
 
@@ -197,15 +206,16 @@ resource "btp_subaccount_entitlement" "feature_flags" {
   plan_name     = "standard"
 }
 # Create the service instance
-data "cloudfoundry_service" "feature_flags" {
-  name       = "feature-flags"
-  depends_on = [btp_subaccount_entitlement.feature_flags]
+data "cloudfoundry_service_plans" "feature_flags" {
+  service_offering_name = "feature-flags"
+  name                  = "standard"
+  depends_on            = [btp_subaccount_entitlement.feature_flags]
 }
 resource "cloudfoundry_service_instance" "feature_flags" {
   name         = "default_feature-flags"
   space        = cloudfoundry_space.dev.id
   type         = "managed"
-  service_plan = data.cloudfoundry_service.feature_flags.service_plans["standard"]
+  service_plan = data.cloudfoundry_service_plans.feature_flags.service_plans[0].id
   depends_on   = [cloudfoundry_space_role.space_manager, cloudfoundry_space_role.space_developer, cloudfoundry_org_role.organization_manager, btp_subaccount_entitlement.feature_flags]
 }
 # Create service key
diff --git a/released/usecases/services_apps/sap_build_code/step2/provider.tf b/released/usecases/services_apps/sap_build_code/step2/provider.tf
index ee60bab1..3afe0b0f 100644
--- a/released/usecases/services_apps/sap_build_code/step2/provider.tf
+++ b/released/usecases/services_apps/sap_build_code/step2/provider.tf
@@ -1,12 +1,12 @@
 terraform {
   required_providers {
     cloudfoundry = {
-      source  = "SAP/cloudfoundry"
-      version = "1.0.0-rc1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "~> 1.0.0"
     }
     btp = {
       source  = "SAP/btp"
-      version = "~> 1.5.0"
+      version = "~> 1.8.0"
     }
   }
 }