diff --git a/addons.tf b/addons.tf
index ddbbbc0..39d3157 100644
--- a/addons.tf
+++ b/addons.tf
@@ -1,7 +1,7 @@
 resource "scalingo_addon" "addons" {
   for_each = { for index, addon in var.addons : addon.provider => addon }
 
-  app               = scalingo_app.app.name
+  app               = scalingo_app.app.id
   provider_id       = each.value.provider
   plan              = each.value.plan
   database_features = each.value.database_features
diff --git a/app.tf b/app.tf
index 43c205c..6d80771 100644
--- a/app.tf
+++ b/app.tf
@@ -19,7 +19,7 @@ resource "scalingo_app" "app" {
 resource "scalingo_container_type" "containers" {
   for_each = var.containers
 
-  app    = scalingo_app.app.name
+  app    = scalingo_app.app.id
   name   = each.key
   amount = each.value.amount
   size   = each.value.size
@@ -29,7 +29,7 @@ resource "scalingo_container_type" "containers" {
 resource "scalingo_autoscaler" "autoscalers" {
   for_each = { for k, v in var.containers : k => v if v.autoscaler != null }
 
-  app            = scalingo_app.app.name
+  app            = scalingo_app.app.id
   container_type = each.key
   metric         = each.value.autoscaler.metric
   target         = each.value.autoscaler.target
diff --git a/domains.tf b/domains.tf
index da16b4c..52e7bc3 100644
--- a/domains.tf
+++ b/domains.tf
@@ -1,7 +1,7 @@
 resource "scalingo_domain" "canonical_domain" {
   for_each = toset(var.domain != null ? [var.domain] : [])
 
-  app         = scalingo_app.app.name
+  app         = scalingo_app.app.id
   canonical   = true
   common_name = var.domain
 
@@ -13,7 +13,7 @@ resource "scalingo_domain" "canonical_domain" {
 resource "scalingo_domain" "domain_aliases" {
   for_each = toset(var.domain_aliases)
 
-  app         = scalingo_app.app.name
+  app         = scalingo_app.app.id
   canonical   = false
   common_name = each.key
 }
diff --git a/log_drains.tf b/log_drains.tf
index 980e442..afef088 100644
--- a/log_drains.tf
+++ b/log_drains.tf
@@ -4,7 +4,7 @@
 resource "scalingo_log_drain" "log_drain" {
   for_each = { for log_drain in var.log_drains : log_drain.type => log_drain }
 
-  app = scalingo_app.app.name
+  app = scalingo_app.app.id
 
   type = each.value.type
   url  = sensitive(each.value.url)