diff --git a/A-Team.mk b/A-Team.mk
index bc8d46d..d894639 100644
--- a/A-Team.mk
+++ b/A-Team.mk
@@ -19,7 +19,13 @@ DEVICE_MAINTAINER := PizzaG
 # A-Team KSU & Mods
 PRODUCT_SOONG_NAMESPACES += \
     [A-Team_Mods] \
-    [A-Team_KSU]
+
+# A-Team KSU & Magisk Root
+ifeq ($(INSTALLER_VARIANT), Custom)
+PRODUCT_SOONG_NAMESPACES += \
+    [A-Team_KSU] \
+    [A-Team_Magisk]
+endif
 
 # A-Team Custom APN
 ifeq ($(APN_VARIABLE), Custom)
@@ -36,12 +42,6 @@ ifneq ($(GSI), true)
     [A-Team_Apps]
 endif
 
-# A-Team Magisk Patching
-ifeq ($(MAGISK), true)
-PRODUCT_SOONG_NAMESPACES += \
-    [A-Team_Magisk]
-endif
-
 TARGET_KERNEL_SOURCE := kernel/motorola/$(DEVICE_KERNEL)
 PRODUCT_SOONG_NAMESPACES += \
   [$(DEVICE_NAME)_$(TARGET_KERNEL)_Kernel]
@@ -52,11 +52,11 @@ PRODUCT_SOONG_NAMESPACES += \
 ## A-Team Gapps Variants ##
 ##################################################################
 
-# A-Team Gapps
+# A-Team MindTheGapps
 ifeq ($(GAPPS_VARIANT), Gapps)
 PRODUCT_SOONG_NAMESPACES += \
-     [A-Team_GAPPS]
-#$(call inherit-product, vendor/gapps/products/gms.mk)
+     [A-Team_G-Apps]
+$(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk)
 #$(call inherit-product, vendor/gms/products/gms.mk)
 endif