diff --git a/calm/dsl/decompile/schemas/ndb_postgres_clone.py.jinja2 b/calm/dsl/decompile/schemas/ndb_postgres_clone.py.jinja2
index 7c586e69..4ea490cc 100644
--- a/calm/dsl/decompile/schemas/ndb_postgres_clone.py.jinja2
+++ b/calm/dsl/decompile/schemas/ndb_postgres_clone.py.jinja2
@@ -1,7 +1,7 @@
 {% macro database_server_clone(obj) %}
 DatabaseServer.Postgres.Clone(
     {%- for key, val in obj.items() %}
-    {{ key }}={% if val.type == "Ref" %}{{val.ref}}('{{val.value}}'){% else %} '{{val.value}}' {% endif %},
+    {{ key }}={% if val.type == "Ref" %}{{val.ref}}("{{val.value}}"){% else %} "{{val.value}}" {% endif %},
     {%- endfor %}
 )
 {% endmacro %}
@@ -9,7 +9,7 @@ DatabaseServer.Postgres.Clone(
 {% macro database_clone(obj) %}
 Database.Postgres.Clone(
     {%- for key, val in obj.items() %}
-    {{ key }}={% if val.type == "Ref" %}{{val.ref}}('{{val.value}}'){% else %} '{{val.value}}' {% endif %},
+    {{ key }}={% if val.type == "Ref" %}{{val.ref}}("{{val.value}}"){% else %} "{{val.value}}" {% endif %},
     {%- endfor %}
 )
 {% endmacro %}
@@ -17,7 +17,7 @@ Database.Postgres.Clone(
 {% macro time_machine_clone(obj) %}
 TimeMachine.Postgres.Clone(
     {%- for key, val in obj.items() %}
-    {{ key }}={% if val.type == "Ref" %}{{val.ref}}('{{val.value}}'){% else %} '{{val.value}}' {% endif %},
+    {{ key }}={% if val.type == "Ref" %}{{val.ref}}("{{val.value}}"){% else %} "{{val.value}}" {% endif %},
     {%- endfor %}
 )
 {% endmacro %}
@@ -27,7 +27,7 @@ Tag.Clone(
     {%- for key, obj_val in obj.items() %}
     {{ key }}=[
     {%- for val in obj_val.value %}
-    {{obj_val.ref}}('{{val.name}}', '{{val.value}}'),
+    {{obj_val.ref}}("{{val.name}}", "{{val.value}}"),
     {%- endfor %}
     ],
     {%- endfor %}
@@ -37,15 +37,15 @@ Tag.Clone(
 {% macro output_vars_clone(obj) %}
 PostgresDatabaseOutputVariables.Clone(
     {%- for key, val in obj.items() %}
-    {{ key }}='{{ val }}',
+    {{ key }}="{{ val }}",
     {%- endfor %}
 )
 {% endmacro %}
 
 {% macro nutanix_db_postgres_clone(obj) %}
 CalmTask.NutanixDB.PostgresDatabase.Clone(
-    name='{{ obj.name }}',
-    account=Ref.Account('{{ obj.account }}'),
+    name="{{ obj.name }}",
+    account=Ref.Account("{{ obj.account }}"),
     database_server_config={{ database_server_clone(obj.database_server) }},
     instance_config={{ database_clone(obj.database) }},
     timemachine_config={{ time_machine_clone(obj.time_machine) }},
diff --git a/calm/dsl/decompile/schemas/ndb_postgres_create.py.jinja2 b/calm/dsl/decompile/schemas/ndb_postgres_create.py.jinja2
index bef0127c..1b6ba6f5 100644
--- a/calm/dsl/decompile/schemas/ndb_postgres_create.py.jinja2
+++ b/calm/dsl/decompile/schemas/ndb_postgres_create.py.jinja2
@@ -1,7 +1,7 @@
 {% macro database_server_create(obj) %}
 DatabaseServer.Postgres.Create(
     {%- for key, val in obj.items() %}
-    {{ key }}={% if val.type == "Ref" %}{{val.ref}}('{{val.value}}'){% else %} '{{val.value}}' {% endif %},
+    {{ key }}={% if val.type == "Ref" %}{{val.ref}}("{{val.value}}"){% else %} "{{val.value}}" {% endif %},
     {%- endfor %}
 )
 {% endmacro %}
@@ -9,7 +9,7 @@ DatabaseServer.Postgres.Create(
 {% macro database_create(obj) %}
 Database.Postgres.Create(
     {%- for key, val in obj.items() %}
-    {{ key }}={% if val.type == "Ref" %}{{val.ref}}('{{val.value}}'){% else %} '{{val.value}}' {% endif %},
+    {{ key }}={% if val.type == "Ref" %}{{val.ref}}("{{val.value}}"){% else %} "{{val.value}}" {% endif %},
     {%- endfor %}
 )
 {% endmacro %}
@@ -17,7 +17,7 @@ Database.Postgres.Create(
 {% macro time_machine_create(obj) %}
 TimeMachine.Postgres.Create(
     {%- for key, val in obj.items() %}
-    {{ key }}={% if val.type == "Ref" %}{{val.ref}}('{{val.value}}'){% else %} '{{val.value}}' {% endif %},
+    {{ key }}={% if val.type == "Ref" %}{{val.ref}}("{{val.value}}"){% else %} "{{val.value}}" {% endif %},
     {%- endfor %}
 )
 {% endmacro %}
@@ -27,7 +27,7 @@ Tag.Create(
     {%- for key, obj_val in obj.items() %}
     {{ key }}=[
     {%- for val in obj_val.value %}
-    {{obj_val.ref}}('{{val.name}}', '{{val.value}}'),
+    {{obj_val.ref}}("{{val.name}}", "{{val.value}}"),
     {%- endfor %}
     ],
     {%- endfor %}
@@ -37,15 +37,15 @@ Tag.Create(
 {% macro output_vars_create(obj) %}
 PostgresDatabaseOutputVariables.Create(
     {%- for key, val in obj.items() %}
-    {{ key }}='{{ val }}',
+    {{ key }}="{{ val }}",
     {%- endfor %}
 )
 {% endmacro %}
 
 {% macro nutanix_db_postgres_create(obj) %}
 CalmTask.NutanixDB.PostgresDatabase.Create(
-    name='{{ obj.name }}',
-    account=Ref.Account('{{ obj.account }}'),
+    name="{{ obj.name }}",
+    account=Ref.Account("{{ obj.account }}"),
     database_server_config={{ database_server_create(obj.database_server) }},
     instance_config={{ database_create(obj.database) }},
     timemachine_config={{ time_machine_create(obj.time_machine) }},
diff --git a/calm/dsl/decompile/schemas/ndb_postgres_create_snapshot.py.jinja2 b/calm/dsl/decompile/schemas/ndb_postgres_create_snapshot.py.jinja2
index 771ceb30..24102d83 100644
--- a/calm/dsl/decompile/schemas/ndb_postgres_create_snapshot.py.jinja2
+++ b/calm/dsl/decompile/schemas/ndb_postgres_create_snapshot.py.jinja2
@@ -1,7 +1,7 @@
 {% macro database_create_snapshot(obj) %}
 Database.Postgres.CreateSnapshot(
     {%- for key, val in obj.items() %}
-    {{ key }}={% if val.type == "Ref" %}{{val.ref}}('{{val.value}}'){% else %} '{{val.value}}' {% endif %},
+    {{ key }}={% if val.type == "Ref" %}{{val.ref}}("{{val.value}}"){% else %} "{{val.value}}" {% endif %},
     {%- endfor %}
 )
 {% endmacro %}
@@ -10,15 +10,15 @@ Database.Postgres.CreateSnapshot(
 {% macro output_vars_create_snapshot(obj) %}
 PostgresDatabaseOutputVariables.CreateSnapshot(
     {%- for key, val in obj.items() %}
-    {{ key }}='{{ val }}',
+    {{ key }}="{{ val }}",
     {%- endfor %}
 )
 {% endmacro %}
 
 {% macro nutanix_db_postgres_create_snapshot(obj) %}
 CalmTask.NutanixDB.PostgresDatabase.CreateSnapshot(
-    name='{{ obj.name }}',
-    account=Ref.Account('{{ obj.account }}'),
+    name="{{ obj.name }}",
+    account=Ref.Account("{{ obj.account }}"),
     instance_config={{ database_create_snapshot(obj.database) }},
     outargs={{ output_vars_create_snapshot(obj.output_vars) }},
 )
diff --git a/calm/dsl/decompile/schemas/ndb_postgres_delete.py.jinja2 b/calm/dsl/decompile/schemas/ndb_postgres_delete.py.jinja2
index 8271aca7..b1f10284 100644
--- a/calm/dsl/decompile/schemas/ndb_postgres_delete.py.jinja2
+++ b/calm/dsl/decompile/schemas/ndb_postgres_delete.py.jinja2
@@ -1,7 +1,7 @@
 {% macro database_delete(obj) %}
 Database.Postgres.Delete(
     {%- for key, val in obj.items() %}
-    {{ key }}={% if val.type == "Ref" %}{{val.ref}}('{{val.value}}'){% else %} '{{val.value}}' {% endif %},
+    {{ key }}={% if val.type == "Ref" %}{{val.ref}}("{{val.value}}"){% else %} "{{val.value}}" {% endif %},
     {%- endfor %}
 )
 {% endmacro %}
@@ -9,8 +9,8 @@ Database.Postgres.Delete(
 
 {% macro nutanix_db_postgres_delete(obj) %}
 CalmTask.NutanixDB.PostgresDatabase.Delete(
-    name='{{ obj.name }}',
-    account=Ref.Account('{{ obj.account }}'),
+    name="{{ obj.name }}",
+    account=Ref.Account("{{ obj.account }}"),
     instance_config={{ database_delete(obj.database) }},
 )
 {% endmacro %}
diff --git a/calm/dsl/decompile/schemas/ndb_postgres_restore.py.jinja2 b/calm/dsl/decompile/schemas/ndb_postgres_restore.py.jinja2
index 1a87741b..70f16e84 100644
--- a/calm/dsl/decompile/schemas/ndb_postgres_restore.py.jinja2
+++ b/calm/dsl/decompile/schemas/ndb_postgres_restore.py.jinja2
@@ -1,7 +1,7 @@
 {% macro database_restore(obj) %}
 Database.Postgres.RestoreFromTimeMachine(
     {%- for key, val in obj.items() %}
-    {{ key }}={% if val.type == "Ref" %}{{val.ref}}('{{val.value}}'){% else %} '{{val.value}}' {% endif %},
+    {{ key }}={% if val.type == "Ref" %}{{val.ref}}("{{val.value}}"){% else %} "{{val.value}}" {% endif %},
     {%- endfor %}
 )
 {% endmacro %}
@@ -10,15 +10,15 @@ Database.Postgres.RestoreFromTimeMachine(
 {% macro output_vars_restore(obj) %}
 PostgresDatabaseOutputVariables.RestoreFromTimeMachine(
     {%- for key, val in obj.items() %}
-    {{ key }}='{{ val }}',
+    {{ key }}="{{ val }}",
     {%- endfor %}
 )
 {% endmacro %}
 
 {% macro nutanix_db_postgres_restore(obj) %}
 CalmTask.NutanixDB.PostgresDatabase.RestoreFromTimeMachine(
-    name='{{ obj.name }}',
-    account=Ref.Account('{{ obj.account }}'),
+    name="{{ obj.name }}",
+    account=Ref.Account("{{ obj.account }}"),
     instance_config={{ database_restore(obj.database) }},
     outargs={{ output_vars_restore(obj.output_vars) }},
 )