diff --git a/airbyte-connector-builder-server/src/main/resources/contribution_templates/metadata.yaml.peb b/airbyte-connector-builder-server/src/main/resources/contribution_templates/metadata.yaml.peb
index 573f330e7b1..58cd2788bb8 100644
--- a/airbyte-connector-builder-server/src/main/resources/contribution_templates/metadata.yaml.peb
+++ b/airbyte-connector-builder-server/src/main/resources/contribution_templates/metadata.yaml.peb
@@ -3,9 +3,8 @@ data:
   allowedHosts:
     hosts:
   {% for host in allowedHosts %}
-  - {{ host }}
+    - "{{ host }}"
   {% endfor %}
-
   registries:
     oss:
       enabled: true
diff --git a/airbyte-webapp/src/services/connectorBuilder/ConnectorBuilderStateService.tsx b/airbyte-webapp/src/services/connectorBuilder/ConnectorBuilderStateService.tsx
index ea3927842d8..b3ab5210d8d 100644
--- a/airbyte-webapp/src/services/connectorBuilder/ConnectorBuilderStateService.tsx
+++ b/airbyte-webapp/src/services/connectorBuilder/ConnectorBuilderStateService.tsx
@@ -189,6 +189,7 @@ const MANIFEST_KEY_ORDER: Array<keyof ConnectorManifest> = [
 export function convertJsonToYaml(json: ConnectorManifest): string {
   const yamlString = dump(json, {
     noRefs: true,
+    quotingType: '"',
     sortKeys: (a: keyof ConnectorManifest, b: keyof ConnectorManifest) => {
       const orderA = MANIFEST_KEY_ORDER.indexOf(a);
       const orderB = MANIFEST_KEY_ORDER.indexOf(b);