diff --git a/builds/amd64/installer/PKG.yml b/builds/amd64/installer/PKG.yml
deleted file mode 100644
index 7f363cd8..00000000
--- a/builds/amd64/installer/PKG.yml
+++ /dev/null
@@ -1 +0,0 @@
-!include $ONL/builds/any/installer/APKG.yml ARCH=amd64
diff --git a/builds/amd64/installer/installed/Makefile b/builds/amd64/installer/installed/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/builds/amd64/installer/installed/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/builds/amd64/installer/installed/PKG.yml b/builds/amd64/installer/installed/PKG.yml
new file mode 100644
index 00000000..ac1ff1a6
--- /dev/null
+++ b/builds/amd64/installer/installed/PKG.yml
@@ -0,0 +1,2 @@
+!include $ONL/builds/any/installer/APKG.yml ARCH=amd64 BOOTMODE=INSTALLED
+
diff --git a/builds/amd64/installer/builds/.gitignore b/builds/amd64/installer/installed/builds/.gitignore
similarity index 100%
rename from builds/amd64/installer/builds/.gitignore
rename to builds/amd64/installer/installed/builds/.gitignore
diff --git a/builds/amd64/installer/installed/builds/Makefile b/builds/amd64/installer/installed/builds/Makefile
new file mode 100644
index 00000000..bcff0452
--- /dev/null
+++ b/builds/amd64/installer/installed/builds/Makefile
@@ -0,0 +1,3 @@
+BOOTMODE=INSTALLED
+include $(ONL)/make/config.amd64.mk
+include $(ONL)/builds/any/installer/grub/builds/Makefile
diff --git a/builds/amd64/installer/installed/builds/boot-config b/builds/amd64/installer/installed/builds/boot-config
new file mode 100644
index 00000000..99685e0d
--- /dev/null
+++ b/builds/amd64/installer/installed/builds/boot-config
@@ -0,0 +1,4 @@
+NETDEV=ma1
+NETAUTO=dhcp
+BOOTMODE=INSTALLED
+SWI=images::latest
diff --git a/builds/amd64/installer/swi/Makefile b/builds/amd64/installer/swi/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/builds/amd64/installer/swi/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/builds/amd64/installer/swi/PKG.yml b/builds/amd64/installer/swi/PKG.yml
new file mode 100644
index 00000000..8b4940f7
--- /dev/null
+++ b/builds/amd64/installer/swi/PKG.yml
@@ -0,0 +1 @@
+!include $ONL/builds/any/installer/APKG.yml ARCH=amd64 BOOTMODE=swi
diff --git a/builds/armel/installer/builds/.gitignore b/builds/amd64/installer/swi/builds/.gitignore
similarity index 100%
rename from builds/armel/installer/builds/.gitignore
rename to builds/amd64/installer/swi/builds/.gitignore
diff --git a/builds/amd64/installer/builds/Makefile b/builds/amd64/installer/swi/builds/Makefile
similarity index 87%
rename from builds/amd64/installer/builds/Makefile
rename to builds/amd64/installer/swi/builds/Makefile
index 1f5d777c..ac17b603 100644
--- a/builds/amd64/installer/builds/Makefile
+++ b/builds/amd64/installer/swi/builds/Makefile
@@ -1,2 +1,3 @@
+BOOTMODE=SWI
 include $(ONL)/make/config.amd64.mk
 include $(ONL)/builds/any/installer/grub/builds/Makefile
diff --git a/builds/amd64/installer/builds/boot-config b/builds/amd64/installer/swi/builds/boot-config
similarity index 100%
rename from builds/amd64/installer/builds/boot-config
rename to builds/amd64/installer/swi/builds/boot-config
diff --git a/builds/any/installer/APKG.yml b/builds/any/installer/APKG.yml
index 62ad5191..0eaa849c 100644
--- a/builds/any/installer/APKG.yml
+++ b/builds/any/installer/APKG.yml
@@ -10,7 +10,7 @@ common:
   maintainer: support@bigswitch.com
 
 packages:
-  - name: onl-installer
+  - name: onl-installer-$BOOTMODE
     summary: Open Network Linux $ARCH Installer
 
     files:
diff --git a/builds/any/installer/grub/builds/Makefile b/builds/any/installer/grub/builds/Makefile
index 99be574f..660be639 100644
--- a/builds/any/installer/grub/builds/Makefile
+++ b/builds/any/installer/grub/builds/Makefile
@@ -2,6 +2,10 @@ ifndef ARCH
 $(error $$ARCH not set)
 endif
 
+ifndef BOOTMODE
+$(error $$BOOTMODE not set)
+endif
+
 ONLPLATFORM = python $(ONL)/tools/onlplatform.py
 PLATFORMS := $(shell $(ONLPM) --platform-manifest onl-loader-initrd:$(ARCH))
 
@@ -11,7 +15,7 @@ MKSHAR_PERMS = autoperms.sh
 
 # Hardcoded to match ONL File naming conventions.
 include $(ONL)/make/version-onl.mk
-INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER
+INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
 
 ifeq ($(ARCH), amd64)
 INSTALLER_ARCH = x86_64
diff --git a/builds/any/installer/uboot/builds/Makefile b/builds/any/installer/uboot/builds/Makefile
index ea5ad357..e7db90ab 100644
--- a/builds/any/installer/uboot/builds/Makefile
+++ b/builds/any/installer/uboot/builds/Makefile
@@ -2,6 +2,10 @@ ifndef ARCH
 $(error $$ARCH not set)
 endif
 
+ifndef BOOTMODE
+$(error $$BOOTMODE not set)
+endif
+
 ONLPLATFORM = python $(ONL)/tools/onlplatform.py
 PLATFORMS := $(shell $(ONLPM) --platform-manifest onl-loader-initrd:$(ARCH))
 
@@ -15,7 +19,7 @@ PYFIT_ENVIRONMENT = PYTHONPATH=$(VONLDIR)/src/python
 
 # Hardcoded to match ONL File naming conventions.
 include $(ONL)/make/version-onl.mk
-INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER
+INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
 
 # default fit image can be used as the canonical location for the initrd
 FIT_IMAGE_ALL := $(shell $(ONLPM) --find-file onl-loader-fit:$(ARCH) onl-loader-fit.itb)
diff --git a/builds/armel/installer/PKG.yml b/builds/armel/installer/PKG.yml
deleted file mode 100644
index 2dba5e13..00000000
--- a/builds/armel/installer/PKG.yml
+++ /dev/null
@@ -1 +0,0 @@
-!include $ONL/builds/any/installer/APKG.yml ARCH=armel
diff --git a/builds/armel/installer/installed/Makefile b/builds/armel/installer/installed/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/builds/armel/installer/installed/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/builds/armel/installer/installed/PKG.yml b/builds/armel/installer/installed/PKG.yml
new file mode 100644
index 00000000..b92a4496
--- /dev/null
+++ b/builds/armel/installer/installed/PKG.yml
@@ -0,0 +1 @@
+!include $ONL/builds/any/installer/APKG.yml ARCH=armel BOOTMODE=installed
diff --git a/builds/powerpc/installer/builds/.gitignore b/builds/armel/installer/installed/builds/.gitignore
similarity index 100%
rename from builds/powerpc/installer/builds/.gitignore
rename to builds/armel/installer/installed/builds/.gitignore
diff --git a/builds/armel/installer/installed/builds/Makefile b/builds/armel/installer/installed/builds/Makefile
new file mode 100644
index 00000000..2e55e0c0
--- /dev/null
+++ b/builds/armel/installer/installed/builds/Makefile
@@ -0,0 +1,3 @@
+BOOTMODE=INSTALLED
+include $(ONL)/make/config.armel.mk
+include $(ONL)/builds/any/installer/uboot/builds/Makefile
diff --git a/builds/armel/installer/installed/builds/boot-config b/builds/armel/installer/installed/builds/boot-config
new file mode 100644
index 00000000..99685e0d
--- /dev/null
+++ b/builds/armel/installer/installed/builds/boot-config
@@ -0,0 +1,4 @@
+NETDEV=ma1
+NETAUTO=dhcp
+BOOTMODE=INSTALLED
+SWI=images::latest
diff --git a/builds/armel/installer/swi/Makefile b/builds/armel/installer/swi/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/builds/armel/installer/swi/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/builds/armel/installer/swi/PKG.yml b/builds/armel/installer/swi/PKG.yml
new file mode 100644
index 00000000..51d53064
--- /dev/null
+++ b/builds/armel/installer/swi/PKG.yml
@@ -0,0 +1 @@
+!include $ONL/builds/any/installer/APKG.yml ARCH=armel BOOTMODE=swi
diff --git a/builds/armel/installer/swi/builds/.gitignore b/builds/armel/installer/swi/builds/.gitignore
new file mode 100644
index 00000000..fbd18542
--- /dev/null
+++ b/builds/armel/installer/swi/builds/.gitignore
@@ -0,0 +1 @@
+*INSTALLER
diff --git a/builds/armel/installer/builds/Makefile b/builds/armel/installer/swi/builds/Makefile
similarity index 87%
rename from builds/armel/installer/builds/Makefile
rename to builds/armel/installer/swi/builds/Makefile
index f1443e22..84e3c64d 100644
--- a/builds/armel/installer/builds/Makefile
+++ b/builds/armel/installer/swi/builds/Makefile
@@ -1,2 +1,3 @@
+BOOTMODE=SWI
 include $(ONL)/make/config.armel.mk
 include $(ONL)/builds/any/installer/uboot/builds/Makefile
diff --git a/builds/armel/installer/builds/boot-config b/builds/armel/installer/swi/builds/boot-config
similarity index 100%
rename from builds/armel/installer/builds/boot-config
rename to builds/armel/installer/swi/builds/boot-config
diff --git a/builds/powerpc/installer/PKG.yml b/builds/powerpc/installer/PKG.yml
deleted file mode 100644
index 2bb3e575..00000000
--- a/builds/powerpc/installer/PKG.yml
+++ /dev/null
@@ -1 +0,0 @@
-!include $ONL/builds/any/installer/APKG.yml ARCH=powerpc
diff --git a/builds/powerpc/installer/installed/Makefile b/builds/powerpc/installer/installed/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/builds/powerpc/installer/installed/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/builds/powerpc/installer/installed/PKG.yml b/builds/powerpc/installer/installed/PKG.yml
new file mode 100644
index 00000000..25b0b747
--- /dev/null
+++ b/builds/powerpc/installer/installed/PKG.yml
@@ -0,0 +1 @@
+!include $ONL/builds/any/installer/APKG.yml ARCH=powerpc BOOTMODE=INSTALLED
diff --git a/builds/powerpc/installer/installed/builds/.gitignore b/builds/powerpc/installer/installed/builds/.gitignore
new file mode 100644
index 00000000..fbd18542
--- /dev/null
+++ b/builds/powerpc/installer/installed/builds/.gitignore
@@ -0,0 +1 @@
+*INSTALLER
diff --git a/builds/powerpc/installer/installed/builds/Makefile b/builds/powerpc/installer/installed/builds/Makefile
new file mode 100644
index 00000000..844194c7
--- /dev/null
+++ b/builds/powerpc/installer/installed/builds/Makefile
@@ -0,0 +1,3 @@
+BOOTMODE=INSTALLED
+include $(ONL)/make/config.powerpc.mk
+include $(ONL)/builds/any/installer/uboot/builds/Makefile
diff --git a/builds/powerpc/installer/installed/builds/boot-config b/builds/powerpc/installer/installed/builds/boot-config
new file mode 100644
index 00000000..99685e0d
--- /dev/null
+++ b/builds/powerpc/installer/installed/builds/boot-config
@@ -0,0 +1,4 @@
+NETDEV=ma1
+NETAUTO=dhcp
+BOOTMODE=INSTALLED
+SWI=images::latest
diff --git a/builds/powerpc/installer/swi/Makefile b/builds/powerpc/installer/swi/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/builds/powerpc/installer/swi/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/builds/powerpc/installer/swi/PKG.yml b/builds/powerpc/installer/swi/PKG.yml
new file mode 100644
index 00000000..e38c1eb8
--- /dev/null
+++ b/builds/powerpc/installer/swi/PKG.yml
@@ -0,0 +1,2 @@
+!include $ONL/builds/any/installer/APKG.yml ARCH=powerpc BOOTMODE=swi
+
diff --git a/builds/powerpc/installer/swi/builds/.gitignore b/builds/powerpc/installer/swi/builds/.gitignore
new file mode 100644
index 00000000..fbd18542
--- /dev/null
+++ b/builds/powerpc/installer/swi/builds/.gitignore
@@ -0,0 +1 @@
+*INSTALLER
diff --git a/builds/powerpc/installer/builds/Makefile b/builds/powerpc/installer/swi/builds/Makefile
similarity index 88%
rename from builds/powerpc/installer/builds/Makefile
rename to builds/powerpc/installer/swi/builds/Makefile
index 414f0bbb..4dba3a3e 100644
--- a/builds/powerpc/installer/builds/Makefile
+++ b/builds/powerpc/installer/swi/builds/Makefile
@@ -1,2 +1,3 @@
+BOOTMODE=SWI
 include $(ONL)/make/config.powerpc.mk
 include $(ONL)/builds/any/installer/uboot/builds/Makefile
diff --git a/builds/powerpc/installer/builds/boot-config b/builds/powerpc/installer/swi/builds/boot-config
similarity index 100%
rename from builds/powerpc/installer/builds/boot-config
rename to builds/powerpc/installer/swi/builds/boot-config