diff --git a/playbooks/group_vars/00_empty_survey.json b/playbooks/group_vars/00_empty_survey.json
deleted file mode 100644
index c234575..0000000
--- a/playbooks/group_vars/00_empty_survey.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "empty survey",
-  "description": "don't use this survey",
-  "spec": [
-    {
-      "type": "text",
-    }
-  ]
-}
diff --git a/playbooks/group_vars/all/01_deploy_application.yml b/playbooks/group_vars/all/01_deploy_application.yml
new file mode 100644
index 0000000..9331faf
--- /dev/null
+++ b/playbooks/group_vars/all/01_deploy_application.yml
@@ -0,0 +1,25 @@
+---
+survey_deploy_application:
+  name: L3 Survey
+  description: Prompt for interface name, ipv4 and ipv6
+  spec:
+  - type: text
+    question_name: Which interface?
+    question_description: Please specify the interface name
+    variable: interface_name
+    required: true
+    default: lo0
+  - type: text
+    question_name: Please set an IPv4 Address
+    question_description: e.g. 192.168.1.1/24, it is OK to leave this blank if you are
+      using IPv6 only
+    variable: interface_ipv4
+    required: false
+    default: 192.168.1.1/24
+  - type: text
+    question_name: Please Set an IPv6 Address
+    question_description: e.g. fc00::2/64, it is OK to leave this blank if you are using
+      IPv4 only
+    variable: interface_ipv6
+    required: false
+    default: fc00::2/64
diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all/all.yml
similarity index 68%
rename from playbooks/group_vars/all.yml
rename to playbooks/group_vars/all/all.yml
index 8400e44..2640db4 100644
--- a/playbooks/group_vars/all.yml
+++ b/playbooks/group_vars/all/all.yml
@@ -1,3 +1,4 @@
+---
 demos:
   deploy_application:
     name: "Deploy Application (survey)"
@@ -6,9 +7,8 @@ demos:
     project: "Ansible official demo project"
     playbook: "playbooks/01_deploy_application.yml"
     credential: "Demo Credential"
-    survey_enabled: no
-    survey_spec: "none"
+    survey_enabled: yes
+    survey_spec: "{{survey_deploy_application}}"
     workshop_type:
       - f5
       - rhel
-empty_survey: "{{ lookup('file', '../../../playbooks/surveys/00_empty_survey.json') }}"
diff --git a/roles/install_demo/tasks/main.yml b/roles/install_demo/tasks/main.yml
index c7c38d5..e073998 100644
--- a/roles/install_demo/tasks/main.yml
+++ b/roles/install_demo/tasks/main.yml
@@ -40,7 +40,7 @@
     playbook: "{{demos[demo].playbook}}"
     credential: "{{demos[demo].credential}}"
     survey_enabled: "{{demos[demo].survey_enabled}}"
-    survey_spec: "{{empty_survey}}"
+    survey_spec: "{{demos[demo].survey_spec}}"
     tower_username: "{{my_tower_username}}"
     tower_password: "{{my_tower_password}}"
     tower_host: "{{my_tower_host}}"