diff --git a/Taskfile.yml b/Taskfile.yml
index 3939c5e6..9c3a9716 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -1,5 +1,23 @@
 version: '2'
 
+vars:
+  GIT_COMMIT:
+    sh: git log -n 1 --format=%h
+
+  GO_PACKAGES:
+    .
+    ./cmd/task
+    ./internal/args
+    ./internal/compiler
+    ./internal/compiler/v1
+    ./internal/compiler/v2
+    ./internal/execext
+    ./internal/logger
+    ./internal/status
+    ./internal/taskfile
+    ./internal/taskfile/version
+    ./internal/templater
+
 tasks:
   # compiles current source code and make "task" executable available on
   # $GOPATH/bin/task{.exe}
diff --git a/Taskvars.yml b/Taskvars.yml
deleted file mode 100644
index 7470fbd0..00000000
--- a/Taskvars.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-GIT_COMMIT:
-  sh: git log -n 1 --format=%h
-
-GO_PACKAGES:
-  .
-  ./cmd/task
-  ./internal/args
-  ./internal/compiler
-  ./internal/compiler/v1
-  ./internal/compiler/v2
-  ./internal/execext
-  ./internal/logger
-  ./internal/status
-  ./internal/taskfile
-  ./internal/templater