diff --git a/muranorepository/Services/activeDirectory-manifest.yaml b/muranorepository/Services/activeDirectory-manifest.yaml
index 57e6c13..7d5330c 100644
--- a/muranorepository/Services/activeDirectory-manifest.yaml
+++ b/muranorepository/Services/activeDirectory-manifest.yaml
@@ -1,15 +1,22 @@
-agent:
-- CreatePrimaryDC.template
-- LeaveDomain.template
-- SetPassword.template
-- CreateSecondaryDC.template
-- AskDnsIp.template
-- JoinDomain.template
-author: ''
+version: 0.1
+service_display_name: Active Directory
+
 description: <strong> The Active Directory Service </strong> includes one primary
   and optionally a few secondary Domain Controllers, with DNS
-enabled: true
+
 full_service_name: activeDirectory
+author: Mirantis Inc.
+service_version: 1
+enabled: true
+
+ui:
+- ActiveDirectory.yaml
+
+workflows:
+- AD.xml
+- Networking.xml
+- Common.xml
+
 heat:
 - RouterInterface.template
 - Windows.template
@@ -22,6 +29,15 @@ heat:
 - DefaultSecurity.template
 - WindowsSecurity.template
 - DomainSecurity.template
+
+agent:
+- CreatePrimaryDC.template
+- LeaveDomain.template
+- SetPassword.template
+- CreateSecondaryDC.template
+- AskDnsIp.template
+- JoinDomain.template
+
 scripts:
 - Install-RoleSecondaryDomainController.ps1
 - Install-RolePrimaryDomainController.ps1
@@ -29,12 +45,4 @@ scripts:
 - ImportCoreFunctions.ps1
 - Get-DnsListeningIpAddress.ps1
 - Set-LocalUserPassword.ps1
-service_display_name: Active Directory
-service_version: ''
-ui:
-- ActiveDirectory.yaml
-version: '0.1'
-workflows:
-- AD.xml
-- Networking.xml
-- Common.xml
+
diff --git a/muranorepository/Services/aspNetApp-manifest.yaml b/muranorepository/Services/aspNetApp-manifest.yaml
index 7e2ae1f..1c645f0 100644
--- a/muranorepository/Services/aspNetApp-manifest.yaml
+++ b/muranorepository/Services/aspNetApp-manifest.yaml
@@ -7,7 +7,7 @@ description: >-
 
 full_service_name: aspNetApp
 author: Mirantis Inc.
-service_version: 1.0
+service_version: 1
 enabled: True
 
 ui:
diff --git a/muranorepository/Services/aspNetAppFarm-manifest.yaml b/muranorepository/Services/aspNetAppFarm-manifest.yaml
index 866fa09..aee9476 100644
--- a/muranorepository/Services/aspNetAppFarm-manifest.yaml
+++ b/muranorepository/Services/aspNetAppFarm-manifest.yaml
@@ -7,7 +7,7 @@ description: >-
 
 full_service_name: aspNetAppFarm
 author: Mirantis Inc.
-service_version: 1.0
+service_version: 1
 enabled: True
 
 ui:
diff --git a/muranorepository/Services/demoService-manifest.yaml b/muranorepository/Services/demoService-manifest.yaml
index 70c0b35..dcbf4b1 100644
--- a/muranorepository/Services/demoService-manifest.yaml
+++ b/muranorepository/Services/demoService-manifest.yaml
@@ -1,7 +1,20 @@
-author: 'Mirantis Inc.'
+version: 0.1
+service_display_name: Demo Service
+
 description: <strong> Demo Service </strong> shows how Murano is working.
-enabled: true
 full_service_name: demoService
+author: Mirantis Inc.
+service_version: 1
+enabled: true
+
+ui:
+- Demo.yaml
+
+workflows:
+- Networking.xml
+- Common.xml
+- Demo.xml
+
 heat:
 - Demo.template
 - RouterInterface.template
@@ -14,13 +27,5 @@ heat:
 - DefaultSecurity.template
 - LinuxSecurity.template
 - DemoSecurity.template
+
 scripts: []
-service_display_name: Demo Service
-service_version: ''
-ui:
-- Demo.yaml
-version: '0.1'
-workflows:
-- Networking.xml
-- Common.xml
-- Demo.xml
diff --git a/muranorepository/Services/linuxApacheService-manifest.yaml b/muranorepository/Services/linuxApacheService-manifest.yaml
index 9f8ce82..ccd8be3 100644
--- a/muranorepository/Services/linuxApacheService-manifest.yaml
+++ b/muranorepository/Services/linuxApacheService-manifest.yaml
@@ -7,7 +7,7 @@ description: >-
 
 full_service_name: linuxApacheService
 author: Mirantis Inc.
-service_version: 1.0
+service_version: 1
 enabled: True
 
 ui:
diff --git a/muranorepository/Services/linuxTelnetService-manifest.yaml b/muranorepository/Services/linuxTelnetService-manifest.yaml
index 2eb24ce..cfef262 100644
--- a/muranorepository/Services/linuxTelnetService-manifest.yaml
+++ b/muranorepository/Services/linuxTelnetService-manifest.yaml
@@ -7,7 +7,7 @@ description: >-
 
 full_service_name: linuxTelnetService
 author: Mirantis Inc.
-service_version: 1.0
+service_version: 1
 enabled: True
 
 ui:
diff --git a/muranorepository/Services/msSqlClusterServer-manifest.yaml b/muranorepository/Services/msSqlClusterServer-manifest.yaml
index 41547f6..9ed82a3 100644
--- a/muranorepository/Services/msSqlClusterServer-manifest.yaml
+++ b/muranorepository/Services/msSqlClusterServer-manifest.yaml
@@ -7,7 +7,7 @@ description: >-
 
 full_service_name: msSqlClusterServer
 author: Mirantis Inc.
-service_version: 1.0
+service_version: 1
 enabled: True
 
 ui:
diff --git a/muranorepository/Services/msSqlServer-manifest.yaml b/muranorepository/Services/msSqlServer-manifest.yaml
index 2928d05..9c84eb3 100644
--- a/muranorepository/Services/msSqlServer-manifest.yaml
+++ b/muranorepository/Services/msSqlServer-manifest.yaml
@@ -7,7 +7,7 @@ description: >-
 
 full_service_name: msSqlServer
 author: Mirantis Inc.
-service_version: 1.0
+service_version: 1
 enabled: True
 
 ui:
diff --git a/muranorepository/Services/webServer-manifest.yaml b/muranorepository/Services/webServer-manifest.yaml
index f2356a9..3999a3a 100644
--- a/muranorepository/Services/webServer-manifest.yaml
+++ b/muranorepository/Services/webServer-manifest.yaml
@@ -7,7 +7,7 @@ description: >-
 
 full_service_name: webServer
 author: Mirantis Inc.
-service_version: 1.0
+service_version: 1
 enabled: True
 
 ui:
diff --git a/muranorepository/Services/webServerFarm-manifest.yaml b/muranorepository/Services/webServerFarm-manifest.yaml
index d1d72c1..e9a8dd5 100644
--- a/muranorepository/Services/webServerFarm-manifest.yaml
+++ b/muranorepository/Services/webServerFarm-manifest.yaml
@@ -6,7 +6,7 @@ description: >-
 
 full_service_name: webServerFarm
 author: Mirantis Inc.
-service_version: 1.0
+service_version: 1
 enabled: True
 
 ui: