diff --git a/api_emulator/redfish/templates/CompositionService.py b/api_emulator/redfish/templates/CompositionService.py
index bba4ac1..152b4c1 100644
--- a/api_emulator/redfish/templates/CompositionService.py
+++ b/api_emulator/redfish/templates/CompositionService.py
@@ -19,7 +19,7 @@
         "State": "Enabled",
         "Health": "OK"
     },
-    "ServiceEnabled": "true",
+    "ServiceEnabled": True,
     "ResourceBlocks": {
         "@odata.id": "{rb}CompositionService/ResourceBlocks"
     },
diff --git a/api_emulator/redfish/templates/EventService.py b/api_emulator/redfish/templates/EventService.py
index c3e9586..16ad18a 100644
--- a/api_emulator/redfish/templates/EventService.py
+++ b/api_emulator/redfish/templates/EventService.py
@@ -19,7 +19,7 @@
         "State": "Enabled",
         "Health": "OK"
     },
-    "ServiceEnabled": "true",
+    "ServiceEnabled": True,
     "DeliveryRetryAttempts": 3,
     "DeliveryRetryIntervalSeconds": 60,
     "EventTypesForSubscription": [
diff --git a/api_emulator/redfish/templates/Manager.py b/api_emulator/redfish/templates/Manager.py
index aa0a53a..968564b 100644
--- a/api_emulator/redfish/templates/Manager.py
+++ b/api_emulator/redfish/templates/Manager.py
@@ -27,14 +27,14 @@
         "Health": "OK"
     },
     "GraphicalConsole": {
-        "ServiceEnabled": "true",
+        "ServiceEnabled": True,
         "MaxConcurrentSessions": 2,
         "ConnectTypesSupported": [
             "KVMIP"
         ]
     },
     "SerialConsole": {
-        "ServiceEnabled": "true",
+        "ServiceEnabled": True,
         "MaxConcurrentSessions": 1,
         "ConnectTypesSupported": [
             "Telnet",
@@ -43,7 +43,7 @@
         ]
     },
     "CommandShell": {
-        "ServiceEnabled": "true",
+        "ServiceEnabled": True,
         "MaxConcurrentSessions": 4,
         "ConnectTypesSupported": [
             "Telnet",