diff --git a/charts/ix-chart/v2009.0.1/questions.yaml b/charts/ix-chart/v2009.0.1/questions.yaml
index 36dc90da92..ffcdc1a2cc 100644
--- a/charts/ix-chart/v2009.0.1/questions.yaml
+++ b/charts/ix-chart/v2009.0.1/questions.yaml
@@ -1,32 +1,39 @@
 # Image related
-- variable: image.repository
-  description: "Docker image repository"
-  label: "Image repository"
+- variable: image
+  description: "Docker Image Details"
   group: "Container Images"
   schema:
-    type: string
+    type: dict
     required: true
-- variable: image.tag
-  description: "Tag to use for specified image"
-  label: "Image Tag"
-  group: "Container Images"
-  schema:
-    type: string
-    default: "latest"
-- variable: image.pull_policy
-  description: "Docker Image Pull Policy"
-  label: "Image Pull Policy"
-  group: "Container Images"
-  schema:
-    type: string
-    default: "IfNotPresent"
-    enum:
-      - "IfNotPresent"
-      - "Always"
-      - "Never"
+    attrs:
+      - variable: image.repository
+        description: "Docker image repository"
+        label: "Image repository"
+        group: "Container Images"
+        schema:
+          type: string
+          required: true
+      - variable: image.tag
+        description: "Tag to use for specified image"
+        label: "Image Tag"
+        group: "Container Images"
+        schema:
+          type: string
+          default: "latest"
+      - variable: image.pull_policy
+        description: "Docker Image Pull Policy"
+        label: "Image Pull Policy"
+        group: "Container Images"
+        schema:
+          type: string
+          default: "IfNotPresent"
+          enum:
+            - "IfNotPresent"
+            - "Always"
+            - "Never"
 
 # Configurable CMD / Entrypoint / Environment Variables
-- variable: container.command
+- variable: container_entrypoint
   description: "Commands to execute inside container overriding image CMD default"
   label: "Container CMD"
   group: "Container Entrypoint"
diff --git a/charts/ix-chart/v2009.0.1/templates/deployment.yaml b/charts/ix-chart/v2009.0.1/templates/deployment.yaml
index 3c209e0c02..3f24e0f9c7 100644
--- a/charts/ix-chart/v2009.0.1/templates/deployment.yaml
+++ b/charts/ix-chart/v2009.0.1/templates/deployment.yaml
@@ -19,21 +19,21 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if .Values.container.command }}
+          {{- if .Values.container_entrypoint.command }}
           command:
-            {{- range .Values.container.command }}
+            {{- range .Values.container_entrypoint.command }}
             - {{ . | quote}}
             {{- end }}
           {{- end }}
-          {{- if .Values.container.args }}
+          {{- if .Values.container_entrypoint.args }}
           args:
-            {{- range .Values.container.args }}
+            {{- range .Values.container_entrypoint.args }}
             - {{ . | quote}}
             {{- end }}
           {{- end }}
-          {{- if .Values.container.environment_variables }}
+          {{- if .Values.container_entrypoint.environment_variables }}
           env:
-            {{- range .Values.container.environment_variables }}
+            {{- range .Values.container_entrypoint.environment_variables }}
             - name: {{ .name | quote }}
               value: {{ .value | quote }}
             {{- end }}
diff --git a/charts/ix-chart/v2009.0.1/values.yaml b/charts/ix-chart/v2009.0.1/values.yaml
index 4a386046af..32a56f97f5 100644
--- a/charts/ix-chart/v2009.0.1/values.yaml
+++ b/charts/ix-chart/v2009.0.1/values.yaml
@@ -1,19 +1,13 @@
 # Default values for ix-chart.
 
-replicaCount: 1
-
 image:
   repository: debian
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: "testing"
 
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
 # Container CMD / entrypoint
-container:
+container_entrypoint:
   command: []
   args: []
   environment_variables: []