diff --git a/.saltstack/minion b/.saltstack/minion
index 9c3fb0e54575f88dcf476407d694da6158e6463d..0d956a42295c0d59f4e0d8dffc7e6e0043b1f126 100644
--- a/.saltstack/minion
+++ b/.saltstack/minion
@@ -2,11 +2,11 @@ state_verbose: True
 
 file_client: local
 
-gitfs_provider: gitpython
+gitfs_provider: pygit2
 
 fileserver_backend:
   - roots
-  - git
+  - gitfs
 
 # Use this if you wanne use gitfs formulas!
 #gitfs_remotes:
diff --git a/Vagrantfile b/Vagrantfile
index 5a74c6a80342bc972298e60e9904e387e44d53a9..194374236c2eeb4e4cede67272f5684844203085 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,28 +2,30 @@
 # vi: set ft=ruby :
 
 Vagrant.configure(2) do |config|
-  # lets us debian buster amd64 as base.
+  # Lets us debian buster amd64 as base.
   config.vm.box = "debian/buster64"
 
-  # sync working dir; ignore folders that were created by node and grunt
+  # Sync working dir; ignore folders that were created by node and grunt
   config.vm.synced_folder ".", "/vagrant", type: "rsync",
     rsync__exclude: [".git/",]
 
-  # install those to be able to use gitfs for node formula
-  config.vm.provision :shell, :inline => "sudo apt-get -y install git-core"
+  # Install those to be able to use gitfs
+  config.vm.provision :shell, :inline => "sudo apt-get -y install git-core python3-pygit2"
   config.vm.provision :shell, :inline => "sudo apt-get -y install python3-setuptools"
-# Don't install GitPython, we should not need it on debian buster
-#  config.vm.provision :shell, :inline => "sudo easy_install GitPython"
+
+  # Symlink states + pillar to /srv
   config.vm.provision :shell, :inline => "ln -s /vagrant/.saltstack/salt /srv/"
   config.vm.provision :shell, :inline => "ln -s /vagrant/.saltstack/pillar /srv/"
 
+  # Use vagrant salt provisioner (uses most recent salt-bootstrap script)
+  # See https://www.vagrantup.com/docs/provisioning/salt.html
   config.vm.provision :salt do |salt|
     # Workaround for:
     # Copying salt minion config to /etc/salt
     # Failed to upload a file to the guest VM via SCP due to a permissions
     # error. [...]; @see:
     # https://github.com/mitchellh/vagrant/issues/5973#issuecomment-137276605
-    # JPT: Added -x python3, so this actually grabs existing repo urls.
+    # JPT: Also use "-x python3", so repo urls actually grab python3 for debian 10
     salt.bootstrap_options = '-F -c /tmp/ -P -x python3'
     salt.masterless = true
     salt.minion_config = ".saltstack/minion"
@@ -31,6 +33,6 @@ Vagrant.configure(2) do |config|
     salt.verbose = true
   end
 
-  # forward some service port from guest to host for testing?!
+  # Forward some service port from guest to host for testing?! not needed yet
   # config.vm.network "forwarded_port", guest:80, host:8888, host_ip:"localhost"
 end