diff --git a/files/board/arpl/p3/addons/9p/purley-4.4.180.tgz b/files/board/arpl/p3/addons/9p/purley-4.4.180.tgz
deleted file mode 100644
index fd3b7afa..00000000
Binary files a/files/board/arpl/p3/addons/9p/purley-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/acpid/purley-4.4.180.tgz b/files/board/arpl/p3/addons/acpid/purley-4.4.180.tgz
deleted file mode 100644
index a9773baf..00000000
Binary files a/files/board/arpl/p3/addons/acpid/purley-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/atl1c/purley-4.4.180.tgz b/files/board/arpl/p3/addons/atl1c/purley-4.4.180.tgz
deleted file mode 100644
index cb75c035..00000000
Binary files a/files/board/arpl/p3/addons/atl1c/purley-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/atl1e/purley-4.4.180.tgz b/files/board/arpl/p3/addons/atl1e/purley-4.4.180.tgz
deleted file mode 100644
index 82794135..00000000
Binary files a/files/board/arpl/p3/addons/atl1e/purley-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/e1000/purley-4.4.180.tgz b/files/board/arpl/p3/addons/e1000/purley-4.4.180.tgz
deleted file mode 100644
index 4c21b697..00000000
Binary files a/files/board/arpl/p3/addons/e1000/purley-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/e1000e/apollolake-4.4.180.tgz b/files/board/arpl/p3/addons/e1000e/apollolake-4.4.180.tgz
deleted file mode 100644
index 765d0113..00000000
Binary files a/files/board/arpl/p3/addons/e1000e/apollolake-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/e1000e/broadwell-4.4.180.tgz b/files/board/arpl/p3/addons/e1000e/broadwell-4.4.180.tgz
deleted file mode 100644
index 2c4f0ec2..00000000
Binary files a/files/board/arpl/p3/addons/e1000e/broadwell-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/e1000e/broadwellnk-4.4.180.tgz b/files/board/arpl/p3/addons/e1000e/broadwellnk-4.4.180.tgz
deleted file mode 100644
index 50f1e649..00000000
Binary files a/files/board/arpl/p3/addons/e1000e/broadwellnk-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/e1000e/bromolow-3.10.108.tgz b/files/board/arpl/p3/addons/e1000e/bromolow-3.10.108.tgz
deleted file mode 100644
index d9b872bb..00000000
Binary files a/files/board/arpl/p3/addons/e1000e/bromolow-3.10.108.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/e1000e/denverton-4.4.180.tgz b/files/board/arpl/p3/addons/e1000e/denverton-4.4.180.tgz
deleted file mode 100644
index a5909abd..00000000
Binary files a/files/board/arpl/p3/addons/e1000e/denverton-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/e1000e/geminilake-4.4.180.tgz b/files/board/arpl/p3/addons/e1000e/geminilake-4.4.180.tgz
index ff852e62..2bf9dfd6 100644
Binary files a/files/board/arpl/p3/addons/e1000e/geminilake-4.4.180.tgz and b/files/board/arpl/p3/addons/e1000e/geminilake-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/addons/e1000e/manifest.yml b/files/board/arpl/p3/addons/e1000e/manifest.yml
index acd8a053..975bf5a7 100644
--- a/files/board/arpl/p3/addons/e1000e/manifest.yml
+++ b/files/board/arpl/p3/addons/e1000e/manifest.yml
@@ -2,23 +2,8 @@ version: 1
 name: e1000e
 description: "Driver for Intel(R) PRO/1000 Gigabit Ethernet PCI-e adapters"
 available-for:
-  bromolow-3.10.108:
-    install-script: &script "install.sh"
-    modules: true
-  apollolake-4.4.180:
-    install-script: *script
-    modules: true
-  broadwell-4.4.180:
-    install-script: *script
-    modules: true
-  broadwellnk-4.4.180:
-    install-script: *script
-    modules: true
-  denverton-4.4.180:
-    install-script: *script
-    modules: true
   geminilake-4.4.180:
-    install-script: *script
+    install-script: &script "install.sh"
     modules: true
   v1000-4.4.180:
     install-script: *script
diff --git a/files/board/arpl/p3/addons/e1000e/purley-4.4.180.tgz b/files/board/arpl/p3/addons/e1000e/purley-4.4.180.tgz
deleted file mode 100644
index dfb85370..00000000
Binary files a/files/board/arpl/p3/addons/e1000e/purley-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/e1000e/v1000-4.4.180.tgz b/files/board/arpl/p3/addons/e1000e/v1000-4.4.180.tgz
index 31c6029e..e6555195 100644
Binary files a/files/board/arpl/p3/addons/e1000e/v1000-4.4.180.tgz and b/files/board/arpl/p3/addons/e1000e/v1000-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/addons/ehci-pci/apollolake-4.4.180.tgz b/files/board/arpl/p3/addons/ehci-pci/apollolake-4.4.180.tgz
new file mode 100644
index 00000000..c044c928
Binary files /dev/null and b/files/board/arpl/p3/addons/ehci-pci/apollolake-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/addons/ehci-pci/broadwell-4.4.180.tgz b/files/board/arpl/p3/addons/ehci-pci/broadwell-4.4.180.tgz
index 3826e96b..66040113 100644
Binary files a/files/board/arpl/p3/addons/ehci-pci/broadwell-4.4.180.tgz and b/files/board/arpl/p3/addons/ehci-pci/broadwell-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/addons/ehci-pci/geminilake-4.4.180.tgz b/files/board/arpl/p3/addons/ehci-pci/geminilake-4.4.180.tgz
index 6b6fd2d7..62e400dc 100644
Binary files a/files/board/arpl/p3/addons/ehci-pci/geminilake-4.4.180.tgz and b/files/board/arpl/p3/addons/ehci-pci/geminilake-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/addons/ehci-pci/manifest.yml b/files/board/arpl/p3/addons/ehci-pci/manifest.yml
index 59ea4900..49cbb685 100644
--- a/files/board/arpl/p3/addons/ehci-pci/manifest.yml
+++ b/files/board/arpl/p3/addons/ehci-pci/manifest.yml
@@ -8,3 +8,6 @@ available-for:
   geminilake-4.4.180:
     install-script: *script
     modules: true
+  apollolake-4.4.180:
+    install-script: *script
+    modules: true
diff --git a/files/board/arpl/p3/addons/i40e/apollolake-4.4.180.tgz b/files/board/arpl/p3/addons/i40e/apollolake-4.4.180.tgz
new file mode 100644
index 00000000..5e6283fb
Binary files /dev/null and b/files/board/arpl/p3/addons/i40e/apollolake-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/addons/i40e/geminilake-4.4.180.tgz b/files/board/arpl/p3/addons/i40e/geminilake-4.4.180.tgz
new file mode 100644
index 00000000..d010ba9f
Binary files /dev/null and b/files/board/arpl/p3/addons/i40e/geminilake-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/addons/i40e/manifest.yml b/files/board/arpl/p3/addons/i40e/manifest.yml
new file mode 100644
index 00000000..80498794
--- /dev/null
+++ b/files/board/arpl/p3/addons/i40e/manifest.yml
@@ -0,0 +1,10 @@
+version: 1
+name: i40e
+description: "Driver for Intel(R) Ethernet Connection XL710 adapter"
+available-for:
+  apollolake-4.4.180:
+    install-script: &script "install.sh"
+    modules: true
+  geminilake-4.4.180:
+    install-script: *script
+    modules: true
diff --git a/files/board/arpl/p3/addons/igb/geminilake-4.4.180.tgz b/files/board/arpl/p3/addons/igb/geminilake-4.4.180.tgz
new file mode 100644
index 00000000..dca73bff
Binary files /dev/null and b/files/board/arpl/p3/addons/igb/geminilake-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/addons/igb/manifest.yml b/files/board/arpl/p3/addons/igb/manifest.yml
new file mode 100644
index 00000000..3e769be9
--- /dev/null
+++ b/files/board/arpl/p3/addons/igb/manifest.yml
@@ -0,0 +1,10 @@
+version: 1
+name: igb
+description: "Driver for Intel(R) 82575 PCI-Express ethernet adapter"
+available-for:
+  geminilake-4.4.180:
+    install-script: &script "install.sh"
+    modules: true
+  v1000-4.4.180:
+    install-script: *script
+    modules: true
diff --git a/files/board/arpl/p3/addons/igb/v1000-4.4.180.tgz b/files/board/arpl/p3/addons/igb/v1000-4.4.180.tgz
new file mode 100644
index 00000000..9232c052
Binary files /dev/null and b/files/board/arpl/p3/addons/igb/v1000-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/addons/ixgbe/apollolake-4.4.180.tgz b/files/board/arpl/p3/addons/ixgbe/apollolake-4.4.180.tgz
new file mode 100644
index 00000000..bcb355ff
Binary files /dev/null and b/files/board/arpl/p3/addons/ixgbe/apollolake-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/addons/ixgbe/geminilake-4.4.180.tgz b/files/board/arpl/p3/addons/ixgbe/geminilake-4.4.180.tgz
new file mode 100644
index 00000000..912264c5
Binary files /dev/null and b/files/board/arpl/p3/addons/ixgbe/geminilake-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/addons/ixgbe/manifest.yml b/files/board/arpl/p3/addons/ixgbe/manifest.yml
new file mode 100644
index 00000000..135a0990
--- /dev/null
+++ b/files/board/arpl/p3/addons/ixgbe/manifest.yml
@@ -0,0 +1,10 @@
+version: 1
+name: ixgbe
+description: "Driver for Intel(R) 10GbE PCI Express adapters"
+available-for:
+  apollolake-4.4.180:
+    install-script: &script "install.sh"
+    modules: true
+  geminilake-4.4.180:
+    install-script: *script
+    modules: true
diff --git a/files/board/arpl/p3/addons/mpt3sas/purley-4.4.180.tgz b/files/board/arpl/p3/addons/mpt3sas/purley-4.4.180.tgz
deleted file mode 100644
index ba4049ee..00000000
Binary files a/files/board/arpl/p3/addons/mpt3sas/purley-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/r8125/purley-4.4.180.tgz b/files/board/arpl/p3/addons/r8125/purley-4.4.180.tgz
deleted file mode 100644
index f499fdb2..00000000
Binary files a/files/board/arpl/p3/addons/r8125/purley-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/r8168/purley-4.4.180.tgz b/files/board/arpl/p3/addons/r8168/purley-4.4.180.tgz
deleted file mode 100644
index 04589702..00000000
Binary files a/files/board/arpl/p3/addons/r8168/purley-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/r8169/purley-4.4.180.tgz b/files/board/arpl/p3/addons/r8169/purley-4.4.180.tgz
deleted file mode 100644
index 3516026c..00000000
Binary files a/files/board/arpl/p3/addons/r8169/purley-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/skge/purley-4.4.180.tgz b/files/board/arpl/p3/addons/skge/purley-4.4.180.tgz
deleted file mode 100644
index 4ee46c83..00000000
Binary files a/files/board/arpl/p3/addons/skge/purley-4.4.180.tgz and /dev/null differ
diff --git a/files/board/arpl/p3/addons/virtio/purley-4.4.180.tgz b/files/board/arpl/p3/addons/virtio/purley-4.4.180.tgz
deleted file mode 100644
index d9aa7566..00000000
Binary files a/files/board/arpl/p3/addons/virtio/purley-4.4.180.tgz and /dev/null differ
diff --git a/img-gen.sh b/img-gen.sh
index 169a9361..5c7bc567 100755
--- a/img-gen.sh
+++ b/img-gen.sh
@@ -21,13 +21,13 @@ unzip /tmp/rp-lkms.zip -d files/board/arpl/p3/lkms
 
 # Get latest addons and install its
 echo "Getting latest Addons"
+mkdir -p /tmp/addons
 if [ -d ../arpl-addons ]; then
   cp ../arpl-addons/*.addon /tmp/addons/
 else
   TAG=`curl -s https://api.github.com/repos/fbelavenuto/arpl-addons/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
   curl -L "https://github.com/fbelavenuto/arpl-addons/releases/download/${TAG}/addons.zip" -o /tmp/addons.zip
   rm -rf /tmp/addons
-  mkdir -p /tmp/addons
   unzip /tmp/addons.zip -d /tmp/addons
 fi
 DEST_PATH="files/board/arpl/p3/addons"