diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-grammar/src/main/java/org/finos/legend/engine/language/hostedService/grammar/from/HostedServiceTreeWalker.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-grammar/src/main/java/org/finos/legend/engine/language/hostedService/grammar/from/HostedServiceTreeWalker.java
index a27c05ca9ee..642c09178cc 100644
--- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-grammar/src/main/java/org/finos/legend/engine/language/hostedService/grammar/from/HostedServiceTreeWalker.java
+++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-grammar/src/main/java/org/finos/legend/engine/language/hostedService/grammar/from/HostedServiceTreeWalker.java
@@ -107,7 +107,7 @@ private HostedService visitHostedService(HostedServiceParserGrammar.ServiceConte
             else
             {
                 HostedServiceParserGrammar.DeploymentContext deploymentOwnerContext = ownerContext.deployment();
-                hostedService.ownership = new DeploymentOwner((deploymentOwnerContext.STRING().getText()));
+                hostedService.ownership = new DeploymentOwner(PureGrammarParserUtility.fromGrammarString(deploymentOwnerContext.STRING().getText(), true));
             }
         }
         HostedServiceParserGrammar.ServiceDocumentationContext descriptionContext = PureGrammarParserUtility.validateAndExtractOptionalField(ctx.serviceDocumentation(), "documentation", hostedService.sourceInformation);
diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-grammar/src/main/java/org/finos/legend/engine/language/hostedService/grammar/to/HostedServiceGrammarComposer.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-grammar/src/main/java/org/finos/legend/engine/language/hostedService/grammar/to/HostedServiceGrammarComposer.java
index f78136600c1..5c6162b4842 100644
--- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-grammar/src/main/java/org/finos/legend/engine/language/hostedService/grammar/to/HostedServiceGrammarComposer.java
+++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-grammar/src/main/java/org/finos/legend/engine/language/hostedService/grammar/to/HostedServiceGrammarComposer.java
@@ -95,7 +95,7 @@ private static String renderServiceOwner(Ownership owner)
         }
         else if (owner instanceof DeploymentOwner)
         {
-            return "Deployment { identifier: " + ((DeploymentOwner)owner).id + " };\n";
+            return "Deployment { identifier: '" + ((DeploymentOwner)owner).id + "' };\n";
         }
         throw new RuntimeException("Owner type invalid");
     }