diff --git a/src/main/java/com/structurizr/export/plantuml/StructurizrPlantUMLExporter.java b/src/main/java/com/structurizr/export/plantuml/StructurizrPlantUMLExporter.java
index dee7835..19fe0c7 100644
--- a/src/main/java/com/structurizr/export/plantuml/StructurizrPlantUMLExporter.java
+++ b/src/main/java/com/structurizr/export/plantuml/StructurizrPlantUMLExporter.java
@@ -259,20 +259,20 @@ protected void startDeploymentNodeBoundary(DeploymentView view, DeploymentNode d
         }
 
         String url = deploymentNode.getUrl();
+        String nodeName = deploymentNode.getName()
         if (!StringUtils.isNullOrEmpty(url)) {
-            url = " [[" + url + "]]";
+            nodeName = " [[" + url + " " + nodeName + "]]";
         } else {
             url = "";
         }
 
         writer.writeLine(
                 format("rectangle \"%s\\n<size:10>%s</size>%s\" <<%s>> as %s%s {",
-                        deploymentNode.getName() + (!"1".equals(deploymentNode.getInstances()) ? " (x" + deploymentNode.getInstances() + ")" : ""),
+                        nodeName + (!"1".equals(deploymentNode.getInstances()) ? " (x" + deploymentNode.getInstances() + ")" : ""),
                         typeOf(view, deploymentNode, true),
                         icon,
                         idOf(deploymentNode),
-                        idOf(deploymentNode),
-                        url
+                        idOf(deploymentNode)
                 )
         );
         writer.indent();
@@ -351,7 +351,7 @@ protected void writeElement(ModelView view, Element element, IndentingWriter wri
                 shape = plantUMLShapeOf(view, elementInstance.getElement());
 
                 if (StringUtils.isNullOrEmpty(url)) {
-                    url = element.getUrl();
+                    url = elementInstance.getUrl();
                     if (!StringUtils.isNullOrEmpty(url)) {
                         url = " [[" + url + "]]";
                     } else {