diff --git a/Ghidra/Features/Base/certification.manifest b/Ghidra/Features/Base/certification.manifest
index c93987664b..5e3032fd05 100644
--- a/Ghidra/Features/Base/certification.manifest
+++ b/Ghidra/Features/Base/certification.manifest
@@ -92,6 +92,7 @@ data/typeinfo/golang/golang_1.18_anybit_any.gdt||GHIDRA||||END|
 data/typeinfo/golang/golang_1.19_anybit_any.gdt||GHIDRA||||END|
 data/typeinfo/golang/golang_1.20_anybit_any.gdt||GHIDRA||||END|
 data/typeinfo/golang/golang_1.21_anybit_any.gdt||GHIDRA||||END|
+data/typeinfo/golang/golang_1.22_anybit_any.gdt||GHIDRA||||END|
 data/typeinfo/golang/runtimesnapshot.go||GHIDRA||||END|
 data/typeinfo/mac_10.9/mac_osx.gdt||GHIDRA||||END|
 data/typeinfo/rust/rust-common.gdt||GHIDRA||||END|
diff --git a/Ghidra/Features/Base/data/typeinfo/golang/golang_1.22_anybit_any.gdt b/Ghidra/Features/Base/data/typeinfo/golang/golang_1.22_anybit_any.gdt
new file mode 100644
index 0000000000..b4a63fd290
Binary files /dev/null and b/Ghidra/Features/Base/data/typeinfo/golang/golang_1.22_anybit_any.gdt differ
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datamgr/DataTypeArchiveIDTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datamgr/DataTypeArchiveIDTest.java
index d9dda4b7ae..ff8ff98917 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datamgr/DataTypeArchiveIDTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datamgr/DataTypeArchiveIDTest.java
@@ -50,6 +50,7 @@ public class DataTypeArchiveIDTest extends AbstractGenericTest {
 			Map.entry("typeinfo/golang/golang_1.19_anybit_any.gdt", "3533812166493410774"),
 			Map.entry("typeinfo/golang/golang_1.20_anybit_any.gdt", "3533817003441909616"),
 			Map.entry("typeinfo/golang/golang_1.21_anybit_any.gdt", "3574190573109087960"),
+			Map.entry("typeinfo/golang/golang_1.22_anybit_any.gdt", "3596108668808850319"),
 			Map.entry("typeinfo/rust/rust-common.gdt", "3557867258392862055"));
 	//@formatter:on
 
diff --git a/Ghidra/Processors/AARCH64/data/languages/AARCH64_golang.register.info b/Ghidra/Processors/AARCH64/data/languages/AARCH64_golang.register.info
index 4c16c5fb57..ffecb12ba7 100644
--- a/Ghidra/Processors/AARCH64/data/languages/AARCH64_golang.register.info
+++ b/Ghidra/Processors/AARCH64/data/languages/AARCH64_golang.register.info
@@ -1,6 +1,6 @@
 <golang>
 	<!-- see https://github.com/golang/go/blob/master/src/internal/abi/abi_arm64.go -->
-	<register_info versions="V1_17,V1_18,V1_19,V1_20,V1_21">
+	<register_info versions="V1_17,V1_18,V1_19,V1_20,V1_21,V1_22">
 		<int_registers list="x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15"/>
 		<float_registers list="q0,q1,q2,q3,q4,q5,q6,q7,q8,q9,q10,q11,q12,q13,q14,q15"/>
 		<stack initialoffset="8" maxalign="8"/>
diff --git a/Ghidra/Processors/x86/data/languages/x86-64-golang.register.info b/Ghidra/Processors/x86/data/languages/x86-64-golang.register.info
index b9233453ad..49222ecea8 100644
--- a/Ghidra/Processors/x86/data/languages/x86-64-golang.register.info
+++ b/Ghidra/Processors/x86/data/languages/x86-64-golang.register.info
@@ -1,6 +1,6 @@
 <golang>
 	<!-- see https://github.com/golang/go/blob/master/src/internal/abi/abi_amd64.go -->
-	<register_info versions="V1_17,V1_18,V1_19,V1_20,V1_21"> <!-- "all", or comma list of: V1_2,V1_16,etc -->
+	<register_info versions="V1_17,V1_18,V1_19,V1_20,V1_21,V1_22"> <!-- "all", or comma list of: V1_2,V1_16,etc -->
 		<int_registers list="RAX,RBX,RCX,RDI,RSI,R8,R9,R10,R11"/>
 		<float_registers list="XMM0,XMM1,XMM2,XMM3,XMM4,XMM5,XMM6,XMM7,XMM8,XMM9,XMM10,XMM11,XMM12,XMM13,XMM14"/>
 		<stack initialoffset="8" maxalign="8"/>