diff --git a/.github/workflows/build-maui-toolkit.yml b/.github/workflows/build-maui-toolkit.yml
index 125b16e..2372463 100644
--- a/.github/workflows/build-maui-toolkit.yml
+++ b/.github/workflows/build-maui-toolkit.yml
@@ -9,7 +9,7 @@ on:
 
 # Allows you to run this workflow manually from the Actions tab
 env:
-  DOTNET_VERSION: '6.0.300'
+  DOTNET_VERSION: '6.0.x'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -31,17 +31,17 @@ jobs:
         uses: actions/setup-dotnet@v2
         with:
           # Optional SDK version to use. If not provided, will install global.json version when available. Examples: 2.2.104, 3.1, 3.1.x
-          dotnet-version: ${{ env.DOTNET_VERSION }}
+          dotnet-version: ${{ secrets.DOTNET_VERSION }}
           # Whether prerelease versions should be matched with non-exact versions (for example 5.0.0-preview.6 being matched by 5, 5.0, 5.x or 5.0.x). Defaults to false if not provided.
           include-prerelease: false
 
       # Install Maui workload
       - name: Install Maui workload
-        run: dotnet workload install maui --from-rollback-file https://aka.ms/dotnet/maui/6.0.300.json --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json
+        run: dotnet workload install maui --from-rollback-file https://aka.ms/dotnet/maui/${{ secrets.DOTNET_VERSION }}.json --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json
 
       # Install WebAssembly workload
       - name: Install WebAssembly workload
-        run: dotnet workload install wasm-tools --from-rollback-file https://aka.ms/dotnet/maui/6.0.300.json --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json
+        run: dotnet workload install wasm-tools --from-rollback-file https://aka.ms/dotnet/maui/${{ secrets.DOTNET_VERSION }}.json --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json
 
       # List installed workload
       - name: List installed workloads
@@ -53,5 +53,16 @@ jobs:
 
       # Build the project in Release mode
       - name: Build the Solution in Release mode
-        shell: cmd
-        run: .\Create-Package.bat Release
+        run: .\Create-Package.bat ${{ secrets.BUILD_CONFIG }} ${{ secrets.MAUI_TOOLKIT_PKG_VERSION }}
+
+      - name: Archive VijayAnand.MauiToolkit.Core NuGet package
+        uses: actions/upload-artifact@v3
+        with:
+          name: archive-core-nuget-package
+          path: src/VijayAnand.MauiToolkit/VijayAnand.MauiToolkit.Core/bin/${{ secrets.BUILD_CONFIG }}/VijayAnand.MauiToolkit.Core.${{ secrets.MAUI_TOOLKIT_PKG_VERSION }}.nupkg
+
+      - name: Archive VijayAnand.MauiToolkit NuGet package
+        uses: actions/upload-artifact@v3
+        with:
+          name: archive-toolkit-nuget-package
+          path: src/VijayAnand.MauiToolkit/VijayAnand.MauiToolkit/bin/${{ secrets.BUILD_CONFIG }}/VijayAnand.MauiToolkit.${{ secrets.MAUI_TOOLKIT_PKG_VERSION }}.nupkg
diff --git a/src/VijayAnand.MauiToolkit/Create-Package.bat b/src/VijayAnand.MauiToolkit/Create-Package.bat
index cf1c8f0..41b3f2e 100644
--- a/src/VijayAnand.MauiToolkit/Create-Package.bat
+++ b/src/VijayAnand.MauiToolkit/Create-Package.bat
@@ -1,31 +1,34 @@
 :: Creates a new NuGet package from the project file
 @echo off
 
-if [%1]==[] (call Error "Build configuration input is not provided." & goto end)
+if [%1]==[] (echo Build configuration input is not provided. & goto end)
 
 set config=%1
 
+if not [%2]==[] (set pkgVersion=%2)
+
 :: Package Name
 
-if not exist CorePackageName.txt (call Error "Core package name file not available." & goto end)
+if not exist CorePackageName.txt (echo Core package name file not available. & goto end)
 
 set /P corePkgName=<CorePackageName.txt
 
-if [%corePkgName%]==[] (call Error "Core package name not configured." & goto end)
+if [%corePkgName%]==[] (echo Core package name not configured. & goto end)
 
-if not exist ToolkitPackageName.txt (call Error "Toolkit package name file not available." & goto end)
+if not exist ToolkitPackageName.txt (echo Toolkit package name file not available. & goto end)
 
 set /P toolkitPkgName=<ToolkitPackageName.txt
 
-if [%toolkitPkgName%]==[] (call Error "Toolkit package name not configured." & goto end)
+if [%toolkitPkgName%]==[] (echo Toolkit package name not configured. & goto end)
 
 :: Package Version
 
-if not exist PackageVersion.txt (call Error "Version file not available." & goto end)
+if not exist PackageVersion.txt (echo Version file not available. & goto end)
 
-set /P pkgVersion=<PackageVersion.txt
+:: If value of pkgVersion is still blank, attempt to read from the PackageVersion file
+if [%pkgVersion%]==[] (set /P pkgVersion=<PackageVersion.txt)
 
-if [%pkgVersion%]==[] (call Error "Version # not configured." & goto end)
+if [%pkgVersion%]==[] (echo Version # not configured. & goto end)
 
 :: .NET SDK Version
 
@@ -33,20 +36,20 @@ dotnet --version
 
 :: Package Configuration
 
-call Info "Core Package: %corePkgName% ver. %pkgVersion%"
-call Info "Toolkit Package: %toolkitPkgName% ver. %pkgVersion%"
+echo Core Package: %corePkgName% ver. %pkgVersion%
+echo Toolkit Package: %toolkitPkgName% ver. %pkgVersion%
 
-call Info "Delete existing package ..."
+echo Delete existing package ...
 
 if exist .\VijayAnand.MauiToolkit.Core\bin\%config%\%corePkgName%.%pkgVersion%.nupkg del .\VijayAnand.MauiToolkit.Core\bin\%config%\%corePkgName%.%pkgVersion%.nupkg
 
 if exist .\VijayAnand.MauiToolkit\bin\%config%\%toolkitPkgName%.%pkgVersion%.nupkg del .\VijayAnand.MauiToolkit\bin\%config%\%toolkitPkgName%.%pkgVersion%.nupkg
 
-call Info "Creating NuGet package ..."
+echo Creating NuGet package ...
 
 dotnet build .\VijayAnand.MauiToolkit.Core\VijayAnand.MauiToolkit.Core.csproj -c %config% -p:PackageVersion=%pkgVersion% -p:ContinuousIntegrationBuild=true
 
-if not %errorlevel% == 0 (call Error "Core package creation failed." & goto end)
+if not %errorlevel% == 0 (echo Core package creation failed. & goto end)
 
 echo.
 :: Adding NuGet reference
@@ -55,6 +58,6 @@ echo.
 dotnet build .\VijayAnand.MauiToolkit\VijayAnand.MauiToolkit.csproj -c %config% -p:PackageVersion=%pkgVersion% -p:ContinuousIntegrationBuild=true
 
 echo.
-if %errorlevel% == 0 (call Success "Process completed.") else (call Error "Toolkit package creation failed.")
+if %errorlevel% == 0 (echo Process completed.) else (echo Toolkit package creation failed.)
 
 :end