diff --git a/gapps-go.mk b/gapps-go.mk
new file mode 100644
index 0000000..2c8de26
--- /dev/null
+++ b/gapps-go.mk
@@ -0,0 +1,2 @@
+$(call inherit-product, build/make/target/product/go_defaults.mk)
+$(call inherit-product, vendor/gapps-go/gapps-go.mk) 
diff --git a/generate.sh b/generate.sh
index ad67928..721a156 100644
--- a/generate.sh
+++ b/generate.sh
@@ -8,7 +8,7 @@ fi
 echo 'PRODUCT_MAKEFILES := \' > AndroidProducts.mk
 
 for part in a ab;do
-	for apps in vanilla gapps foss;do
+	for apps in vanilla gapps foss gapps-go;do
 		for arch in arm64 arm;do
 			for su in yes no;do
 				apps_suffix=""
@@ -20,6 +20,11 @@ for part in a ab;do
 					apps_script='$(call inherit-product, device/phh/treble/gapps.mk)'
 					apps_name="with GApps"
 				fi
+				if [ "$apps" == "gapps-go" ];then
+					apps_suffix="o"
+					apps_script='$(call inherit-product, device/phh/treble/gapps-go.mk)'
+					app_name="Go"
+				fi
 				if [ "$apps" == "foss" ];then
 					apps_suffix="f"
 					apps_script='$(call inherit-product, vendor/foss/foss.mk)'