diff --git a/iiab-configure b/iiab-configure
index ad492627a..cd6c69d17 100755
--- a/iiab-configure
+++ b/iiab-configure
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 INVENTORY="ansible_hosts"
-PLAYBOOK="iiab-from-console.yml"
+PLAYBOOK="iiab-from-cmdline.yml"
 CWD=`pwd`
 if [ ! -f $PLAYBOOK ]; then
     echo "Exiting: IIAB Playbook not found."
diff --git a/iiab-from-cmdline.yml b/iiab-from-cmdline.yml
new file mode 100644
index 000000000..4bf43513b
--- /dev/null
+++ b/iiab-from-cmdline.yml
@@ -0,0 +1,18 @@
+---
+- hosts: all
+  become: yes
+
+  vars_files:
+  - vars/default_vars.yml
+  - vars/{{ ansible_local.local_facts.os_ver }}.yml
+  - /etc/iiab/local_vars.yml
+  - /etc/iiab/config_vars2.yml
+
+  roles:
+    - { role: 0-init, tags: ['0-init'] }
+    - { role: 4-server-options, tags: ['4-server-options'] }
+    - { role: 5-xo-services, tags: ['5-xo-services'] }
+    - { role: 6-generic-apps, tags: ['6-generic-apps'] }
+    - { role: 7-edu-apps, tags: ['7-edu-apps'] }
+    - { role: 8-mgmt-tools, tags: ['8-mgmt-tools'] }
+    - { role: 9-local-addons, tags: ['9-local-addons'] }