diff --git a/tools/NuGet/BuildAndPostPackages.bat b/tools/NuGet/BuildAndPostPackages.bat
deleted file mode 100644
index 5a3fa28b85a..00000000000
--- a/tools/NuGet/BuildAndPostPackages.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-call .\BuildPackages.bat
-
-SET Artifactory=https://art-bobcat.autodesk.com/artifactory/api/nuget/team-dynamo-nuget
-
-:: Push these packages to www.nuget.org
-nuget push DynamoVisualProgramming.Core.*.nupkg -apikey %1
-nuget push DynamoVisualProgramming.DynamoCoreNodes.*.nupkg -apikey %1
-nuget push DynamoVisualProgramming.DynamoServices.*.nupkg -apikey %1
-nuget push DynamoVisualProgramming.Tests.*.nupkg -apikey %1
-nuget push DynamoVisualProgramming.WpfUILibrary.*.nupkg -apikey %1
-nuget push DynamoVisualProgramming.ZeroTouchLibrary.*.nupkg -apikey %1
-
-:: Push Runtime package to Artifactory
-nuget push DynamoVisualProgramming.DynamoCoreRuntime.*.nupkg -source %Artifactory% -apikey %2
diff --git a/tools/NuGet/BuildPackages.bat b/tools/NuGet/BuildPackages.bat
index e48625ca48b..f7685603e60 100644
--- a/tools/NuGet/BuildPackages.bat
+++ b/tools/NuGet/BuildPackages.bat
@@ -1,6 +1,9 @@
+:: Argument %1: path to template folder
+::
+
 @echo off
-SET base=..\..\src\DynamoInstall\harvest
-if not exist %base% (
+set harvestPath=..\..\src\DynamoInstall\harvest
+if not exist %harvestPath% (
   echo Dynamo\src\DynamoInstall\harvest folder not found.
   echo Please build Dynamo\src\Install.sln before running this script!
   exit /b 1
@@ -8,7 +11,7 @@ if not exist %base% (
 
 :: Get version string from "DynamoCore.dll"
 set count=1
-for /f %%f in ('cscript //Nologo ..\install\GetFileVersion.vbs %base%\DynamoCore.dll') do (
+for /f %%f in ('cscript //Nologo ..\install\GetFileVersion.vbs %harvestPath%\DynamoCore.dll') do (
   setlocal EnableDelayedExpansion
   if !count!==1 set Major=%%f
   if !count!==2 set Minor=%%f
@@ -24,9 +27,9 @@ del *.nupkg
 if exist nuspec ( rmdir /s /q nuspec )
 mkdir nuspec
 
-:: Copy .nuspec files from "template" folder to "nuspec" folder
+:: Copy .nuspec files from template folder to "nuspec" folder
 :: and replace the string "@VERSION@" with the correct value
-for %%f in (template\*.nuspec) do (
+for %%f in (%1\*.nuspec) do (
   for /f "tokens=* delims=¶" %%i in ( '"type %%f"') do (
     set line=%%i
     setlocal EnableDelayedExpansion
@@ -39,5 +42,5 @@ for %%f in (template\*.nuspec) do (
 :: Pack .nupkg files based on each .nuspec in the "nuspec" folder
 @echo on
 for %%f in (nuspec\*.nuspec) do (
-  nuget pack %%f -basepath %base%
+  nuget pack %%f -basepath %harvestPath%
 )
diff --git a/tools/NuGet/PostArtifactoryPackages.bat b/tools/NuGet/PostArtifactoryPackages.bat
new file mode 100644
index 00000000000..7d54bd7bf79
--- /dev/null
+++ b/tools/NuGet/PostArtifactoryPackages.bat
@@ -0,0 +1,7 @@
+call .\BuildPackages.bat "template-artifactory"
+
+set Artifactory=https://art-bobcat.autodesk.com/artifactory/api/nuget/team-dynamo-nuget
+
+:: Use credentials in config file for pushing package to Artifactory
+set configPath=%~dp0..\..\dynamo-nuget.config
+nuget push *.nupkg -source %Artifactory% -configfile %configPath%
diff --git a/tools/NuGet/PostNugetPackages.bat b/tools/NuGet/PostNugetPackages.bat
new file mode 100644
index 00000000000..49947b2eb15
--- /dev/null
+++ b/tools/NuGet/PostNugetPackages.bat
@@ -0,0 +1,7 @@
+:: Argument %1: API key to upload packages to www.nuget.org
+::
+
+call .\BuildPackages.bat "template-nuget"
+
+:: Push these packages to www.nuget.org
+nuget push *.nupkg -apikey %1
diff --git a/tools/NuGet/template/DynamoVisualProgramming.DynamoCoreRuntime.nuspec b/tools/NuGet/template-artifactory/DynamoVisualProgramming.DynamoCoreRuntime.nuspec
similarity index 100%
rename from tools/NuGet/template/DynamoVisualProgramming.DynamoCoreRuntime.nuspec
rename to tools/NuGet/template-artifactory/DynamoVisualProgramming.DynamoCoreRuntime.nuspec
diff --git a/tools/NuGet/template/DynamoVisualProgramming.Core.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec
similarity index 100%
rename from tools/NuGet/template/DynamoVisualProgramming.Core.nuspec
rename to tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec
diff --git a/tools/NuGet/template/DynamoVisualProgramming.DynamoCoreNodes.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec
similarity index 100%
rename from tools/NuGet/template/DynamoVisualProgramming.DynamoCoreNodes.nuspec
rename to tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec
diff --git a/tools/NuGet/template/DynamoVisualProgramming.DynamoServices.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoServices.nuspec
similarity index 100%
rename from tools/NuGet/template/DynamoVisualProgramming.DynamoServices.nuspec
rename to tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoServices.nuspec
diff --git a/tools/NuGet/template/DynamoVisualProgramming.Tests.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec
similarity index 100%
rename from tools/NuGet/template/DynamoVisualProgramming.Tests.nuspec
rename to tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec
diff --git a/tools/NuGet/template/DynamoVisualProgramming.WpfUILibrary.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec
similarity index 100%
rename from tools/NuGet/template/DynamoVisualProgramming.WpfUILibrary.nuspec
rename to tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec
diff --git a/tools/NuGet/template/DynamoVisualProgramming.ZeroTouchLibrary.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec
similarity index 100%
rename from tools/NuGet/template/DynamoVisualProgramming.ZeroTouchLibrary.nuspec
rename to tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec