diff --git a/Bonsai.Templates/Bonsai.EnvironmentTemplate/.bonsai/Setup.cmd b/Bonsai.Templates/Bonsai.EnvironmentTemplate/.bonsai/Setup.cmd
new file mode 100644
index 00000000..92d983d9
--- /dev/null
+++ b/Bonsai.Templates/Bonsai.EnvironmentTemplate/.bonsai/Setup.cmd
@@ -0,0 +1,4 @@
+@echo off
+pushd %~dp0
+powershell -ExecutionPolicy Bypass -File ./Setup.ps1
+popd
\ No newline at end of file
diff --git a/Bonsai.Templates/Bonsai.EnvironmentTemplate/Setup.ps1 b/Bonsai.Templates/Bonsai.EnvironmentTemplate/.bonsai/Setup.ps1
similarity index 75%
rename from Bonsai.Templates/Bonsai.EnvironmentTemplate/Setup.ps1
rename to Bonsai.Templates/Bonsai.EnvironmentTemplate/.bonsai/Setup.ps1
index ca5fd189..01cfba61 100644
--- a/Bonsai.Templates/Bonsai.EnvironmentTemplate/Setup.ps1
+++ b/Bonsai.Templates/Bonsai.EnvironmentTemplate/.bonsai/Setup.ps1
@@ -1,3 +1,4 @@
+Push-Location $PSScriptRoot
 if (!(Test-Path "./Bonsai.exe")) {
     $release = "https://github.com/bonsai-rx/bonsai/releases/latest/download/Bonsai.zip"
     $configPath = "./Bonsai.config"
@@ -10,10 +11,11 @@ if (!(Test-Path "./Bonsai.exe")) {
         }
     }
     Invoke-WebRequest $release -OutFile "temp.zip"
-    Move-Item -Path "NuGet.config" "temp.config"
+    Move-Item -Path "NuGet.config" "temp.config" -ErrorAction SilentlyContinue
     Expand-Archive "temp.zip" -DestinationPath "." -Force
-    Move-Item -Path "temp.config" "NuGet.config" -Force
+    Move-Item -Path "temp.config" "NuGet.config" -Force -ErrorAction SilentlyContinue
     Remove-Item -Path "temp.zip"
     Remove-Item -Path "Bonsai32.exe"
 }
-& .\Bonsai.exe --no-editor
\ No newline at end of file
+& .\Bonsai.exe --no-editor
+Pop-Location
\ No newline at end of file
diff --git a/Bonsai.Templates/Bonsai.EnvironmentTemplate/.template.config/template.json b/Bonsai.Templates/Bonsai.EnvironmentTemplate/.template.config/template.json
index ff019547..308514d2 100644
--- a/Bonsai.Templates/Bonsai.EnvironmentTemplate/.template.config/template.json
+++ b/Bonsai.Templates/Bonsai.EnvironmentTemplate/.template.config/template.json
@@ -16,11 +16,13 @@
         }],
         "args": {
             "executable": "powershell",
-            "args": "-File Setup.ps1",
+            "args": "-File .bonsai/Setup.ps1",
             "redirectStandardOutput": false
-        }
-          
+        },
+        "applyFileRenamesToArgs": [ "args" ]
     }],
+    "sourceName": ".bonsai",
+    "defaultName": ".bonsai",
     "shortName": "bonsaienv",
-    "preferNameDirectory": true
+    "preferDefaultName": true
 }
\ No newline at end of file
diff --git a/Bonsai.Templates/Bonsai.EnvironmentTemplate/Setup.cmd b/Bonsai.Templates/Bonsai.EnvironmentTemplate/Setup.cmd
deleted file mode 100644
index 0dbbaef3..00000000
--- a/Bonsai.Templates/Bonsai.EnvironmentTemplate/Setup.cmd
+++ /dev/null
@@ -1 +0,0 @@
-powershell -ExecutionPolicy Bypass -File ./Setup.ps1
\ No newline at end of file
diff --git a/Bonsai.Templates/Bonsai.Templates.csproj b/Bonsai.Templates/Bonsai.Templates.csproj
index 0021f360..47f373f6 100644
--- a/Bonsai.Templates/Bonsai.Templates.csproj
+++ b/Bonsai.Templates/Bonsai.Templates.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>2.8.0</PackageVersion>
+    <PackageVersion>2.8.1</PackageVersion>
     <PackageId>Bonsai.Templates</PackageId>
     <Title>Bonsai Templates</Title>
     <Authors>Bonsai</Authors>