diff --git a/Models/HP EliteOne 800 G3/BIOS-2.16/SPDownload.txt b/Models/HP EliteOne 800 G3/BIOS-2.16/SPDownload.txt
new file mode 100644
index 0000000..ea6f5b7
--- /dev/null
+++ b/Models/HP EliteOne 800 G3/BIOS-2.16/SPDownload.txt	
@@ -0,0 +1,3 @@
+
+SPaqURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87251.exe
+NoteURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87251.html
diff --git a/Models/HP EliteOne 800 G3/BIOS-Update.txt b/Models/HP EliteOne 800 G3/BIOS-Update.txt
new file mode 100644
index 0000000..d3e0a42
--- /dev/null
+++ b/Models/HP EliteOne 800 G3/BIOS-Update.txt	
@@ -0,0 +1,17 @@
+# BIOS Update EliteOne 800 G3
+
+#The BIOS version the device should be on
+Version == 2.16
+
+#Command to be executed for the BIOS update
+Command==HPBIOSUPDREC\HPBIOSUPDREC64.exe
+
+# Silent
+Arg1 == -s
+# Do not restart automatically
+Arg2 == -r
+# Disable BitLocker during upgrade
+Arg3 == -b
+# Password file (will be removed if empty password)
+Arg4 == -p"@@PASSWORD_FILE@@"
+
diff --git a/Models/HP EliteOne 800 G3/Shared-Activate-UEFIBoot.txt b/Models/HP EliteOne 800 G3/Shared-Activate-UEFIBoot.txt
new file mode 100644
index 0000000..1ec24c8
--- /dev/null
+++ b/Models/HP EliteOne 800 G3/Shared-Activate-UEFIBoot.txt	
@@ -0,0 +1,2 @@
+# Shared directory for HP Pro/Elite Desk/One 600/800 G3
+Directory == HP Pro-Elite Desk-One 600-800 G3
diff --git a/Models/HP EliteOne 800 G3/Shared-BIOS-Settings.txt b/Models/HP EliteOne 800 G3/Shared-BIOS-Settings.txt
new file mode 100644
index 0000000..e9b2b8f
--- /dev/null
+++ b/Models/HP EliteOne 800 G3/Shared-BIOS-Settings.txt	
@@ -0,0 +1,2 @@
+# Shared directory for HP EliteDesk 8x0 G3
+Directory == HP EliteDesk 8x0 G3
diff --git a/Models/HP EliteOne 800 G3/Shared-ME-Update.txt b/Models/HP EliteOne 800 G3/Shared-ME-Update.txt
new file mode 100644
index 0000000..1ec24c8
--- /dev/null
+++ b/Models/HP EliteOne 800 G3/Shared-ME-Update.txt	
@@ -0,0 +1,2 @@
+# Shared directory for HP Pro/Elite Desk/One 600/800 G3
+Directory == HP Pro-Elite Desk-One 600-800 G3
diff --git a/Models/HP EliteOne 800 G3/Shared-TPM-BIOS-Settings.txt b/Models/HP EliteOne 800 G3/Shared-TPM-BIOS-Settings.txt
new file mode 100644
index 0000000..1ec24c8
--- /dev/null
+++ b/Models/HP EliteOne 800 G3/Shared-TPM-BIOS-Settings.txt	
@@ -0,0 +1,2 @@
+# Shared directory for HP Pro/Elite Desk/One 600/800 G3
+Directory == HP Pro-Elite Desk-One 600-800 G3
diff --git a/Models/HP EliteOne 800 G3/Shared-TPM-Update.txt b/Models/HP EliteOne 800 G3/Shared-TPM-Update.txt
new file mode 100644
index 0000000..d7d885e
--- /dev/null
+++ b/Models/HP EliteOne 800 G3/Shared-TPM-Update.txt	
@@ -0,0 +1,2 @@
+
+Directory == TPM SLB 9670
diff --git a/Models/HP ProBook 640 G2/Shared-BIOS-Settings.txt b/Models/HP ProBook 640 G2/Shared-BIOS-Settings.txt
new file mode 100644
index 0000000..e0606fe
--- /dev/null
+++ b/Models/HP ProBook 640 G2/Shared-BIOS-Settings.txt	
@@ -0,0 +1,2 @@
+
+Directory == HP ProBook 6x0 G2
diff --git a/Models/HP ProBook 650 G2/Shared-BIOS-Settings.txt b/Models/HP ProBook 650 G2/Shared-BIOS-Settings.txt
new file mode 100644
index 0000000..e0606fe
--- /dev/null
+++ b/Models/HP ProBook 650 G2/Shared-BIOS-Settings.txt	
@@ -0,0 +1,2 @@
+
+Directory == HP ProBook 6x0 G2
diff --git a/Shared/HP EliteBook 8xx G1/BIOS-1.44/SPDownload.txt b/Shared/HP EliteBook 8xx G1/BIOS-1.44/SPDownload.txt
deleted file mode 100644
index d8e04fa..0000000
--- a/Shared/HP EliteBook 8xx G1/BIOS-1.44/SPDownload.txt	
+++ /dev/null
@@ -1,3 +0,0 @@
-
-SPaqURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87482.exe
-NoteURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87482.html
diff --git a/Shared/HP EliteBook 8xx G1/BIOS-1.45/SPDownload.txt b/Shared/HP EliteBook 8xx G1/BIOS-1.45/SPDownload.txt
new file mode 100644
index 0000000..15d5af8
--- /dev/null
+++ b/Shared/HP EliteBook 8xx G1/BIOS-1.45/SPDownload.txt	
@@ -0,0 +1,3 @@
+
+SPaqURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87955.exe
+NoteURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87955.html
diff --git a/Shared/HP EliteBook 8xx G1/BIOS-Update.txt b/Shared/HP EliteBook 8xx G1/BIOS-Update.txt
index 2f0bafc..e8275ab 100644
--- a/Shared/HP EliteBook 8xx G1/BIOS-Update.txt	
+++ b/Shared/HP EliteBook 8xx G1/BIOS-Update.txt	
@@ -1,7 +1,7 @@
 # EliteBook 8x0 G1
 
 # The BIOS version the device should have
-Version == 1.44
+Version == 1.45
 
 # Command to be executed for the BIOS update
 Command==HPBiosUpdRec64.exe 
diff --git a/Shared/HP EliteBook 8xx G2/BIOS-1.25/SPDownload.txt b/Shared/HP EliteBook 8xx G2/BIOS-1.25/SPDownload.txt
deleted file mode 100644
index a62cfa6..0000000
--- a/Shared/HP EliteBook 8xx G2/BIOS-1.25/SPDownload.txt	
+++ /dev/null
@@ -1,3 +0,0 @@
-
-SPaqURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87488.exe
-NoteURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87488.html
diff --git a/Shared/HP EliteBook 8xx G2/BIOS-1.26/SPDownload.txt b/Shared/HP EliteBook 8xx G2/BIOS-1.26/SPDownload.txt
new file mode 100644
index 0000000..f82be47
--- /dev/null
+++ b/Shared/HP EliteBook 8xx G2/BIOS-1.26/SPDownload.txt	
@@ -0,0 +1,3 @@
+
+SPaqURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87962.exe
+NoteURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87962.html
diff --git a/Shared/HP EliteBook 8xx G2/BIOS-Update.txt b/Shared/HP EliteBook 8xx G2/BIOS-Update.txt
index 4a21f06..edde7d3 100644
--- a/Shared/HP EliteBook 8xx G2/BIOS-Update.txt	
+++ b/Shared/HP EliteBook 8xx G2/BIOS-Update.txt	
@@ -1,7 +1,7 @@
 # EliteBook 8x0 G2 BIOS Update
 
 #The BIOS version the device should be on
-Version == 1.25
+Version == 1.26
 
 #Command to be executed for the BIOS update
 Command==HPBiosUpdRec64.exe 
diff --git a/Shared/HP EliteBook 8xx G3/BIOS-1.25/SPDownload.txt b/Shared/HP EliteBook 8xx G3/BIOS-1.25/SPDownload.txt
deleted file mode 100644
index 22f41b7..0000000
--- a/Shared/HP EliteBook 8xx G3/BIOS-1.25/SPDownload.txt	
+++ /dev/null
@@ -1,3 +0,0 @@
-
-SPaqURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87117.exe
-NoteURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87117.html
diff --git a/Shared/HP EliteBook 8xx G3/BIOS-1.29/SPDownload.txt b/Shared/HP EliteBook 8xx G3/BIOS-1.29/SPDownload.txt
new file mode 100644
index 0000000..0880eb2
--- /dev/null
+++ b/Shared/HP EliteBook 8xx G3/BIOS-1.29/SPDownload.txt	
@@ -0,0 +1,3 @@
+
+SPaqURL==https://ftp.hp.com/pub/softpaq/sp88001-88500/sp88259.exe
+NoteURL==https://ftp.hp.com/pub/softpaq/sp88001-88500/sp88259.html
diff --git a/Shared/HP EliteBook 8xx G3/BIOS-Update.txt b/Shared/HP EliteBook 8xx G3/BIOS-Update.txt
index 84f2a21..6ea6632 100644
--- a/Shared/HP EliteBook 8xx G3/BIOS-Update.txt	
+++ b/Shared/HP EliteBook 8xx G3/BIOS-Update.txt	
@@ -2,7 +2,7 @@
 
 
 # The BIOS version the device should be on
-Version == 1.25
+Version == 1.29
 
 # Command to be executed for the BIOS update
 Command==HPBiosUpdRec64.exe 
diff --git a/Shared/HP EliteBook 8xx G3/ME-11.8.50.3470/SPDownload.txt b/Shared/HP EliteBook 8xx G3/ME-11.8.50.3470/SPDownload.txt
index 7c64036..ba3be29 100644
--- a/Shared/HP EliteBook 8xx G3/ME-11.8.50.3470/SPDownload.txt	
+++ b/Shared/HP EliteBook 8xx G3/ME-11.8.50.3470/SPDownload.txt	
@@ -1,2 +1,2 @@
-SPaqURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87435.exe
-NoteURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87435.html
+SPaqURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87856.exe
+NoteURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87856.html
diff --git a/Shared/HP ProBook 6x0 G1/BIOS-1.44/SPDownload.txt b/Shared/HP ProBook 6x0 G1/BIOS-1.44/SPDownload.txt
deleted file mode 100644
index fe7f66a..0000000
--- a/Shared/HP ProBook 6x0 G1/BIOS-1.44/SPDownload.txt	
+++ /dev/null
@@ -1,3 +0,0 @@
-
-SPaqURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87503.exe
-NoteURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87503.html
diff --git a/Shared/HP ProBook 6x0 G1/BIOS-1.45/SPDownload.txt b/Shared/HP ProBook 6x0 G1/BIOS-1.45/SPDownload.txt
new file mode 100644
index 0000000..45937da
--- /dev/null
+++ b/Shared/HP ProBook 6x0 G1/BIOS-1.45/SPDownload.txt	
@@ -0,0 +1,3 @@
+
+SPaqURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87953.exe
+NoteURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87953.html
diff --git a/Shared/HP ProBook 6x0 G1/BIOS-Update.txt b/Shared/HP ProBook 6x0 G1/BIOS-Update.txt
index 5fd4c82..dff9402 100644
--- a/Shared/HP ProBook 6x0 G1/BIOS-Update.txt	
+++ b/Shared/HP ProBook 6x0 G1/BIOS-Update.txt	
@@ -2,7 +2,7 @@
 
 
 #The BIOS version the device should be on
-Version == 1.44
+Version == 1.45
 
 #Command to be executed for the BIOS update
 Command==HPBiosUpdRec64.exe 
diff --git a/Shared/HP ProBook 6x0 G2/BIOS-1.19/SPDownload.txt b/Shared/HP ProBook 6x0 G2/BIOS-1.19/SPDownload.txt
deleted file mode 100644
index eb7af0a..0000000
--- a/Shared/HP ProBook 6x0 G2/BIOS-1.19/SPDownload.txt	
+++ /dev/null
@@ -1,3 +0,0 @@
-
-SPaqURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87217.exe
-NoteURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87217.html
diff --git a/Shared/HP ProBook 6x0 G2/BIOS-1.21/SPDownload.txt b/Shared/HP ProBook 6x0 G2/BIOS-1.21/SPDownload.txt
new file mode 100644
index 0000000..64a17ea
--- /dev/null
+++ b/Shared/HP ProBook 6x0 G2/BIOS-1.21/SPDownload.txt	
@@ -0,0 +1,3 @@
+
+SPaqURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87972.exe
+NoteURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87972.html
diff --git a/Shared/HP ProBook 6x0 G2/BIOS-Settings.txt b/Shared/HP ProBook 6x0 G2/BIOS-Settings.txt
new file mode 100644
index 0000000..5245150
--- /dev/null
+++ b/Shared/HP ProBook 6x0 G2/BIOS-Settings.txt	
@@ -0,0 +1,32 @@
+# ProBook 6x0 G2
+
+## Boot options
+Configure Legacy Support and Secure Boot == Legacy Support Disable and Secure Boot Enable
+UEFI Boot Options == Enable
+Enable MS UEFI CA key == Yes
+
+# Let the BIOS do some basic init stuff
+Fast Boot == Disable
+
+## TPM
+TPM Device == Available
+TPM State == Enable
+TPM Activation Policy == No prompts
+
+Automatic BIOS Update Setting == Disable
+
+## CPU Features
+# VTx is required for Hyper-V / Device Guard
+Virtualization Technology (VTx) == Enable
+
+# Might cause issues with the GPU
+Virtualization Technology for Directed I/O (VTd) == Disable
+
+##  CPU - General
+Turbo-boost == Enable
+Hyperthreading == Enable
+Multi-processor == Enable
+## Ownership
+
+Asset Tracking Number == @@COMPUTERNAME@@
+#Ownership Tag == Property of ...
diff --git a/Shared/HP ProBook 6x0 G2/BIOS-Update.txt b/Shared/HP ProBook 6x0 G2/BIOS-Update.txt
index 98f34d0..4684b0a 100644
--- a/Shared/HP ProBook 6x0 G2/BIOS-Update.txt	
+++ b/Shared/HP ProBook 6x0 G2/BIOS-Update.txt	
@@ -2,7 +2,7 @@
 
 
 #The BIOS version the device should be on
-Version == 1.19
+Version == 1.21
 
 #Command to be executed for the BIOS update
 Command==HPBiosUpdRec64.exe 
diff --git a/Shared/HP ProBook 6x0 G2/ME-11.8.50.3470/SPDownload.txt b/Shared/HP ProBook 6x0 G2/ME-11.8.50.3470/SPDownload.txt
index 384147b..06e3021 100644
--- a/Shared/HP ProBook 6x0 G2/ME-11.8.50.3470/SPDownload.txt	
+++ b/Shared/HP ProBook 6x0 G2/ME-11.8.50.3470/SPDownload.txt	
@@ -1,3 +1,3 @@
 
-SPaqURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87435.exe
-NoteURL==https://ftp.hp.com/pub/softpaq/sp87001-87500/sp87435.html
+SPaqURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87856.exe
+NoteURL==https://ftp.hp.com/pub/softpaq/sp87501-88000/sp87856.html