diff --git a/ntc_templates/templates/hp_procurve_show_version.textfsm b/ntc_templates/templates/hp_procurve_show_version.textfsm
new file mode 100644
index 0000000000..b1857091fe
--- /dev/null
+++ b/ntc_templates/templates/hp_procurve_show_version.textfsm
@@ -0,0 +1,18 @@
+Value MODEL (\S+)
+Value VERSION (\d+.\d+.\d+.\d+\s*\S+)
+Value COMPILATION (.+)
+Value FIPS_MODE (\S+)
+Value UPTIME (.+)
+Value REBOOT_CAUSE (.+)
+
+Start
+  ^\s*Aruba\s*Operating\s*System\s*Software
+  ^\s*ArubaOS\s*\(MODEL:\s*${MODEL}\),\s*Version\s*${VERSION}
+  ^\s*Website:\s*http://www.arubanetworks.com
+  ^\s*\(c\)\s*Copyright\s*\d+\s*Hewlett\s*Packard\s*Enterprise\s*Development\s*LP\.
+  ^\s*Compiled\s*on\s*${COMPILATION}
+  ^\s*FIPS\s*Mode\s*:\s*${FIPS_MODE}
+  ^\s*AP\s*uptime\s*is\s*${UPTIME}
+  ^\s*Reboot\s*Time\s*and\s*Cause\s*:\s*${REBOOT_CAUSE}
+  ^\s*$$
+  ^.*$$ -> Error
diff --git a/ntc_templates/templates/index b/ntc_templates/templates/index
index 2298eca7f7..86ae369e2b 100644
--- a/ntc_templates/templates/index
+++ b/ntc_templates/templates/index
@@ -621,20 +621,21 @@ hp_comware_display_vlan_all.textfsm, .*, hp_comware, di[[splay]] v[[lan]] a[[ll]
 hp_comware_display_clock.textfsm, .*, hp_comware, di[[splay]] clo[[ck]]
 hp_comware_display_arp.textfsm, .*, hp_comware, di[[splay]] a[[rp]]
 
-hp_procurve_show_lldp_info_remote-device_detail.textfsm, .*, hp_procurve, sh[[ow]] ll[[dp]] i[[nfo]] r[[emote-device]] .+
-hp_procurve_show_lldp_info_remote-device.textfsm, .*, hp_procurve, sh[[ow]] ll[[dp]] i[[nfo]] r[[emote-device]]
-hp_procurve_show_cdp_neighbors_detail.textfsm, .*, hp_procurve, sh[[ow]] cd[[p]] nei[[ghbors]] d[[etail]]
-hp_procurve_show_interfaces_brief.textfsm, .*, hp_procurve, sh[[ow]] int[[erfaces]] b[[rief]]
-hp_procurve_show_port-security.textfsm, .*, hp_procurve, sh[[ow]] port-s[[ecurity]]
-hp_procurve_show_tech_buffers.textfsm, .*, hp_procurve, sh[[ow]] tec[[h]] buf[[ffers]]
-hp_procurve_show_mac-address.textfsm, .*, hp_procurve, sh[[ow]] mac-a[[ddress]]
-hp_procurve_show_interfaces.textfsm, .*, hp_procurve, sh[[ow]] int[[erfaces]]
-hp_procurve_show_ip_route.textfsm, .*, hp_procurve, sh[[ow]] ip ro[[ute]]
-hp_procurve_show_system.textfsm, .*, hp_procurve, sh[[ow]] syst[[em]]
-hp_procurve_show_trunks.textfsm, .*, hp_procurve, sh[[ow]] tr[[unks]]
-hp_procurve_show_vlans.textfsm, .*, hp_procurve, sh[[ow]] vl[[ans]]
-hp_procurve_show_arp.textfsm, .*, hp_procurve, sh[[ow]] ar[[p]]
-hp_procurve_show_ip.textfsm, .*, hp_procurve, sh[[ow]] ip
+hp_procurve_show_lldp_info_remote-device_detail.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] ll[[dp]] i[[nfo]] r[[emote-device]] .+
+hp_procurve_show_lldp_info_remote-device.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] ll[[dp]] i[[nfo]] r[[emote-device]]
+hp_procurve_show_cdp_neighbors_detail.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] cd[[p]] nei[[ghbors]] d[[etail]]
+hp_procurve_show_interfaces_brief.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] int[[erfaces]] b[[rief]]
+hp_procurve_show_port-security.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] port-s[[ecurity]]
+hp_procurve_show_tech_buffers.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] tec[[h]] buf[[ffers]]
+hp_procurve_show_mac-address.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] mac-a[[ddress]]
+hp_procurve_show_interfaces.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] int[[erfaces]]
+hp_procurve_show_ip_route.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] ip ro[[ute]]
+hp_procurve_show_version.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] ve[[rsion]]
+hp_procurve_show_system.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] syst[[em]]
+hp_procurve_show_trunks.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] tr[[unks]]
+hp_procurve_show_vlans.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] vl[[ans]]
+hp_procurve_show_arp.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] ar[[p]]
+hp_procurve_show_ip.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] ip
 
 huawei_smartax_display_ont_info_summary_ont.textfsm:huawei_smartax_display_ont_info_summary_sn.textfsm, .*, huawei_smartax, di[[splay]] ont i[[nfo]] su[[mmary]] \S+ *$
 huawei_smartax_display_ont_info_0_1_2.textfsm:huawei_smartax_display_ont_info_description.textfsm, .*, huawei_smartax, di[[splay]] ont i[[nfo]] (\d+\s*|\d+ \d+ \d+\s*)\s*[[all]] *$
diff --git a/tests/hp_procurve/show_version/hp_procurve_show_version.raw b/tests/hp_procurve/show_version/hp_procurve_show_version.raw
new file mode 100644
index 0000000000..63467cd865
--- /dev/null
+++ b/tests/hp_procurve/show_version/hp_procurve_show_version.raw
@@ -0,0 +1,9 @@
+Aruba Operating System Software.
+ArubaOS (MODEL: 310), Version 01.01.0.1 SSR
+Website: http://www.arubanetworks.com
+(c) Copyright 2001 Hewlett Packard Enterprise Development LP.
+Compiled on 2001-01-01 at 01:01:01 UTC (build 00001) by jenkins
+FIPS Mode :disabled
+
+AP uptime is 01 hours 01 minutes 01 seconds
+Reboot Time and Cause: AP rebooted caused by cold HW reset(power loss)
diff --git a/tests/hp_procurve/show_version/hp_procurve_show_version.yml b/tests/hp_procurve/show_version/hp_procurve_show_version.yml
new file mode 100644
index 0000000000..6db9c09561
--- /dev/null
+++ b/tests/hp_procurve/show_version/hp_procurve_show_version.yml
@@ -0,0 +1,8 @@
+---
+parsed_sample:
+  - compilation: "2001-01-01 at 01:01:01 UTC (build 00001) by jenkins"
+    fips_mode: "disabled"
+    model: "310"
+    reboot_cause: "AP rebooted caused by cold HW reset(power loss)"
+    uptime: "01 hours 01 minutes 01 seconds"
+    version: "01.01.0.1 SSR"