diff --git a/.github/workflows/format_validation.yml b/.github/workflows/format_validation.yml
new file mode 100644
index 00000000000..42b6e07aa9b
--- /dev/null
+++ b/.github/workflows/format_validation.yml
@@ -0,0 +1,17 @@
+name: format_validation
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    container:
+      image: ixsystems/catalog_validation:latest
+
+    steps:
+    - uses: actions/checkout@v1
+      name: Checkout
+    - name: Validate catalog format
+      run: |
+        /bin/bash -c "PWD=${pwd}; /usr/local/bin/catalog_validate validate --path $PWD"
diff --git a/test/ix-chart/2010.0.2/questions.yaml b/test/ix-chart/2010.0.2/questions.yaml
index a7d38295a00..b88b73a1b7b 100644
--- a/test/ix-chart/2010.0.2/questions.yaml
+++ b/test/ix-chart/2010.0.2/questions.yaml
@@ -51,6 +51,7 @@ questions:
   # Image related
   - variable: image
     description: "Docker Image Details"
+    label: "Docker Image"
     group: "Container Images"
     schema:
       type: dict
@@ -101,6 +102,7 @@ questions:
   - variable: restartPolicy
     description: "Restart Policy for workload"
     label: "Restart Policy"
+    group: "Restart Policy"
     schema:
       type: string
       show_if: [["workloadType", "=", "Deployment"]]
@@ -115,6 +117,7 @@ questions:
   - variable: jobRestartPolicy
     description: "Restart Policy for workload"
     label: "Restart Policy"
+    group: "Restart Policy"
     schema:
       type: string
       default: "OnFailure"
@@ -303,6 +306,7 @@ questions:
   - variable: hostPortsList
     label: "Specify host ports for the workload"
     description: "Only use host ports if scaling of a workload is not required"
+    group: "Networking"
     schema:
       show_if: [["updateStrategy", "=", "Recreate"]]
       type: list