diff --git a/meta/io.murano/Classes/Environment.yaml b/meta/io.murano/Classes/Environment.yaml
index 26a1c04e..b41f9c4f 100644
--- a/meta/io.murano/Classes/Environment.yaml
+++ b/meta/io.murano/Classes/Environment.yaml
@@ -41,7 +41,12 @@ Properties:
 Methods:
   initialize:
     Body:
-      - $this.agentListener: new(sys:AgentListener, name => $.name)
+      - $heatStackName: $.getAttr(heatStackName)
+      - If: $heatStackName = null
+      - Then:
+          - $heatStackName: randomName()
+          - $.setAttr(heatStackName, $heatStackName)
+      - $this.agentListener: new(sys:AgentListener, name => $heatStackName)
       - $this.stack: new(sys:HeatStack, name => $.name)
       - $this.instanceNotifier: new(sys:InstanceNotifier, environment => $this)
       - $this.reporter: new(sys:StatusReporter, environment => $this)