diff --git a/charts/keepalived/v2.2.0/questions.yaml b/charts/keepalived/v2.2.0/questions.yaml
index 3e4fabe..dc7a52f 100644
--- a/charts/keepalived/v2.2.0/questions.yaml
+++ b/charts/keepalived/v2.2.0/questions.yaml
@@ -3,52 +3,69 @@ labels:
 categories:
 - High Availibility
 questions:
+# VRRP Basic Configuration
 - variable: keepalived.virtual_ip
   default: "192.168.1.1"
   description: "VRRP Virtual IP Address"
   label: Virtual IP
   type: string
-  group: VRRP IP Configuration
+  group: VRRP Configuration
   required: true
 - variable: keepalived.virtual_mask
   default: 24
   description: "VRRP Virtual IP Network Mask (0-255)"
   label: Network Mask
   type: int
-  group: VRRP IP Configuration
+  group: VRRP Configuration
   required: true
 - variable: keepalived.vrid
   default: 1
   description: "VRRP Virtual Router ID (0-255)"
   label: Router ID
   type: int
-  group: VRRP IP Configuration
+  group: VRRP Configuration
   required: true
 - variable: keepalived.interface
   default: "eth0"
   description: "Network Interface for VRRP Packets"
   label: Network Interface
   type: string
-  group: VRRP IP Configuration
+  group: VRRP Configuration
   required: true
 - variable: keepalived.auth_pass
   default: "agoodpwd"
   description: "8 characters VRRP Authentication Password"
   label: Auth Password
   type: string
-  group: Keepalived Configuration
+  group: VRRP Configuration
   required: true
+
+# Service Kind
+- variable: haManagedService
+  default: "Nginx Ingress Controller"
+  description: "Which HA Service should Keepalive manage?"
+  type: enum
+  label: "HA Service"
+  options:
+    - "Nginx Ingress"
+    - "Generic HTTPS"
+    - "Generic HTTP"
+    - "Generic TCP"
+    - "Other"
+  group: Health Check
 - variable: keepalived.check_script
+  show_if: "serviceKind=Other"
   default: "ss -ltn | grep :443"
-  description: "Service Healthcheck Script (runs in the Keepalived container)"
+  description: "Service Healthcheck Script (runs inside the Keepalived container)"
   label: Check Script
   type: string
-  group: Keepalived Configuration
+  group: Health Check
+  required: true
+- variable: keepalived.check_port
+  show_if: "serviceKind=Generic TCP"
+  default: "80"
+  description: "Generic TCP Port"
+  label: Check Port
+  type: int
+  group: Health Check
   required: true
-- variable: nodeSelector
-  default: "role=ingress"
-  description: "Node Selector for the Keepalived Pods."
-  label: Node Selector
-  type: string
-  group: Container Scheduling
-  required: false