diff --git a/terraform/iac/buckets.tf b/terraform/iac/buckets.tf
index 9ab2533..82b6475 100644
--- a/terraform/iac/buckets.tf
+++ b/terraform/iac/buckets.tf
@@ -43,10 +43,3 @@ resource "scaleway_object_bucket_policy" "policy" {
     ]
   })
 }
-
-resource "scaleway_object" "encryption_key" {
-  bucket = scaleway_object_bucket.infra_assets.id
-  key    = "keys/${replace(data.contabo_instance.microk8s.mac_address, ":", "_")}.key"
-
-  content_base64 = base64encode(var.encryption_key)
-}
diff --git a/terraform/iac/encryption.tf b/terraform/iac/encryption.tf
new file mode 100644
index 0000000..e43fe88
--- /dev/null
+++ b/terraform/iac/encryption.tf
@@ -0,0 +1,13 @@
+resource "scaleway_object" "encryption_key" {
+  bucket = scaleway_object_bucket.infra_assets.id
+  key    = "keys/${replace(data.contabo_instance.microk8s.mac_address, ":", "_")}.key"
+
+  content_base64 = base64encode(var.encryption_key)
+}
+
+resource "scaleway_object" "system_id_encryption_key" {
+  bucket = scaleway_object_bucket.infra_assets.id
+  key    = "keys/${var.system_id}.key"
+
+  content_base64 = base64encode(var.encryption_key)
+}
diff --git a/terraform/iac/variables.tf b/terraform/iac/variables.tf
index 582068b..f7322e6 100644
--- a/terraform/iac/variables.tf
+++ b/terraform/iac/variables.tf
@@ -63,3 +63,9 @@ variable "bucket_suffix" {
   type        = string
   sensitive   = true
 }
+
+variable "system_id" {
+  description = "System ID"
+  type        = string
+  sensitive   = true
+}