diff --git a/src/main/json/project.config.schema.json b/src/main/json/project.config.schema.json
index ca54222..40eeed8 100644
--- a/src/main/json/project.config.schema.json
+++ b/src/main/json/project.config.schema.json
@@ -2,40 +2,40 @@
   "title": "Strawboss project configuration schema",
   "type": "object",
   "properties": {
-    "name": "string",
-    "versionCmd": "string",
+    "name": { "type": "string" },
+    "versionCmd": { "type": "string" },
     "steps": {
       "title": "StepsCollection",
       "type": "object",
       "minProperties": 1,
       "properties": {
         "patternProperties": {
-          "^[\w-]+$": {
+          "^[\\w-]+$": {
             "type": "object",
             "title": "StepDefinition",
             "properties": {
-              "workingDir": "string",
-              "stepCmd": "string",
+              "workingDir": { "type": "string"},
+              "stepCmd": { "type": "string"},
               "artifacts": {
                 "type": "array",
-                "items": "string" },
+                "items": { "type": "string" }},
               "cmdInput": {
                 "type": "array",
-                "items": "string" },
+                "items": { "type": "string" }},
               "depends": {
                 "type": "array",
-                "items": "string" },
+                "items": { "type": "string" }},
               "expectedEnv": {
                 "type": "array",
-                "items": "string" },
-              "dontCache": "bool",
-              "additionalProperties": false
-            }
+                "items": { "type": "string" }},
+              "dontCache": "bool"
+            },
+            "additionalProperties": false
           }
         }
       }
-    },
-    "required": ["name", "steps"],
-    "additionalProperties": false
-  }
+    }
+  },
+  "required": ["name", "steps"],
+  "additionalProperties": false
 }
diff --git a/src/main/json/service.config.schema.json b/src/main/json/service.config.schema.json
index 0e75c43..c321b68 100644
--- a/src/main/json/service.config.schema.json
+++ b/src/main/json/service.config.schema.json
@@ -2,7 +2,7 @@
   "title": "StrawBoss service configuration schema.",
   "type": "object",
   "properties": {
-    "artifactsRepo": "string",
+    "artifactsRepo": { "type": "string" },
     "projects": {
       "title": "ProjectsList",
       "type": "array",
@@ -10,19 +10,17 @@
         "title": "ProjectDefinition",
         "type": "object",
         "properties": {
-          "name": "string",
-          "repo": "string",
-          "defaultBranch": "string",
-          "cfgFilePath": "string",
+          "name": { "type": "string" },
+          "repo": { "type": "string" },
+          "defaultBranch": { "type": "string" },
+          "cfgFilePath": { "type": "string" },
           "envVars": {
             "type": "object",
-            "patternProperties": {
-              "^[\w-]+$": "string"
-            }
-          },
-          "required": ["name", "repo"],
-          "additionalProperties": false
-        }
+            "patternProperties": { "^[\\w-]+$": { "type": "string" } }
+          }
+        },
+        "required": ["name", "repo"],
+        "additionalProperties": false
       }
     },
     "users": {
@@ -32,8 +30,8 @@
         "title": "UserDefinition",
         "type": "object",
         "properties": {
-          "username": "string",
-          "hashedPwd": "string"
+          "username": { "type": "string" },
+          "hashedPwd": { "type": "string" }
         },
         "required": ["username", "hashedPwd"],
         "additionalProperties": false
@@ -42,9 +40,9 @@
     "tokens": {
       "title": "TokensList",
       "type": "array",
-      "items": "string"
-    },
-    "required": ["artifactsRepo", "projects", "users", "tokens"],
-    "additionalProperties": false
-  }
+      "items": { "type": "string" }
+    }
+  },
+  "required": ["artifactsRepo", "projects", "users", "tokens"],
+  "additionalProperties": false
 }