diff --git a/Tools/git/build b/Tools/git/build
index 9a8f435..1c63eaf 100755
--- a/Tools/git/build
+++ b/Tools/git/build
@@ -1,7 +1,6 @@
 #!/usr/bin/env modbuild
 
 pbuild::set_download_url "http://www.kernel.org/pub/software/scm/$P/$P-${V_PKG}.tar.gz"
-pbuild::add_to_group 'Tools'
 pbuild::compile_in_sourcetree
 pbuild::install_docfiles 'COPYING' 'README.md'
 
@@ -21,7 +20,7 @@ pbuild::pre_configure() {
 }
 
 pbuild::post_compile() {
-	make -C contrib/subtree prefix="${prefix}"
+	make -C contrib/subtree prefix="${PREFIX}"
 }
 
 pbuild::post_install() {
diff --git a/Tools/git/files/variants.rhel6 b/Tools/git/files/variants.rhel6
deleted file mode 100644
index 74c7389..0000000
--- a/Tools/git/files/variants.rhel6
+++ /dev/null
@@ -1,6 +0,0 @@
-git/2.3.3	stable		Tcl/8.6.4 Tk/8.6.4
-git/2.8.1	stable		Tcl/8.6.4 Tk/8.6.4
-git/2.21.0	stable		TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
-git/2.22.0	stable		TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
-git/2.30.0	stable		TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
-git/2.33.1	stable		TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
diff --git a/Tools/git/files/variants.yaml b/Tools/git/files/variants.yaml
new file mode 100644
index 0000000..44de42f
--- /dev/null
+++ b/Tools/git/files/variants.yaml
@@ -0,0 +1,19 @@
+overlay: base
+relstage: stable
+group: Tools
+
+git/2.3.3:
+ - dependencies: Tcl/8.6.4 Tk/8.6.4
+git/2.8.1:
+ - dependencies: Tcl/8.6.4 Tk/8.6.4
+git/2.21.0:
+ - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
+git/2.22.0:
+ - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
+git/2.30.0:
+ - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
+git/2.33.1:
+ - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
+git/2.37.0:
+ - dependencies: TclTk/8.6.9
+   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8