diff --git a/.github/workflows/apt-arm.yml b/.github/workflows/apt-arm.yml
index 17242aa9e..8ff6f116a 100644
--- a/.github/workflows/apt-arm.yml
+++ b/.github/workflows/apt-arm.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - fluent-package-v5
+      - fluent-package-v6
   pull_request:
 concurrency:
   group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}
diff --git a/.github/workflows/apt.yml b/.github/workflows/apt.yml
index 45b997b2b..5a77f242e 100644
--- a/.github/workflows/apt.yml
+++ b/.github/workflows/apt.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - fluent-package-v5
+      - fluent-package-v6
   pull_request:
 concurrency:
   group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}
diff --git a/.github/workflows/bundle-audit.yml b/.github/workflows/bundle-audit.yml
index aeeb6feb4..f3f59dc46 100644
--- a/.github/workflows/bundle-audit.yml
+++ b/.github/workflows/bundle-audit.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - fluent-package-v5
+      - fluent-package-v6
   pull_request:
   workflow_dispatch:
 concurrency:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 04debe32c..4d54c2c55 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - fluent-package-v5
+      - fluent-package-v6
   pull_request:
 concurrency:
   group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 750797b9d..a218ba35e 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - fluent-package-v5
+      - fluent-package-v6
   pull_request:
 concurrency:
   group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}
diff --git a/.github/workflows/yum-arm.yml b/.github/workflows/yum-arm.yml
index 733b92495..ad5ba03d6 100644
--- a/.github/workflows/yum-arm.yml
+++ b/.github/workflows/yum-arm.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - fluent-package-v5
+      - fluent-package-v6
   pull_request:
 concurrency:
   group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}
diff --git a/.github/workflows/yum.yml b/.github/workflows/yum.yml
index 2cae27ecd..40934f941 100644
--- a/.github/workflows/yum.yml
+++ b/.github/workflows/yum.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - fluent-package-v5
+      - fluent-package-v6
   pull_request:
 concurrency:
   group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}
diff --git a/fluent-package/msi/pkgsize-test.ps1 b/fluent-package/msi/pkgsize-test.ps1
index 0552b905f..900a996e4 100644
--- a/fluent-package/msi/pkgsize-test.ps1
+++ b/fluent-package/msi/pkgsize-test.ps1
@@ -1,22 +1,27 @@
 $ErrorActionPreference = 'Stop'
 
+$PSVersionTable
+
 $base_uri = "http://packages.treasuredata.com.s3.amazonaws.com"
 &git fetch --unshallow
+$previous_version = (git describe --abbrev=0 --tags) -Replace "v",""
+$major_version = ([version] $previous_version).Major
 try {
-    $previous_version = (git describe --abbrev=0 --tags) -Replace "v",""
     "Previous version from git: {0}" -F $previous_version | Write-Host
-    $previous_msi_name = "td-agent-${previous_version}-x64.msi"
-    $response = Invoke-WebRequest -Uri "${base_uri}/4/windows/${previous_msi_name}" -OutFile $previous_msi_name -PassThru
+    $previous_msi_name = "fluent-package-${previous_version}-x64.msi"
+    $response = Invoke-WebRequest -UseBasicParsing -Uri "${base_uri}/${major_version}/windows/${previous_msi_name}" -OutFile $previous_msi_name -PassThru
 }
 catch {
     $heroku_uri = 'http://td-agent-package-browser.herokuapp.com'
     Write-Host "An exception was caught: $($_.Exception.Message). Try to find previous version in ${heroku_uri} instead"
-    $msi_links = (Invoke-WebRequest -Uri "${heroku_uri}/4/windows").Links.href | Where-Object {$_ -like "*.msi"}
+    "Checking package major version: {0}" -F $major_version | Write-Host
+    "Checking {0}/{1}/windows" -F $heroku_uri, $major_version | Write-Host
+    $msi_links = (Invoke-WebRequest -UseBasicParsing -Uri "${heroku_uri}/${major_version}/windows").Links.href | Where-Object {$_ -like "*.msi"}
     $msi_versions = $($msi_links | Select-String '(\d+\.\d+\.\d+)' | ForEach-Object { $_.Matches[0].Groups[1].Value }) | Sort-Object {[version] $_}
     $previous_version = $msi_versions | Select-Object -Last 1
     "Previous version from {0}: {1}" -F ${heroku_uri}, $previous_version | Write-Host
-    $previous_msi_name = "td-agent-${previous_version}-x64.msi"
-    $response = Invoke-WebRequest -Uri "${base_uri}/4/windows/${previous_msi_name}" -OutFile $previous_msi_name -PassThru
+    $previous_msi_name = "fluent-package-${previous_version}-x64.msi"
+    $response = Invoke-WebRequest -UseBasicParsing -Uri "${base_uri}/${major_version}/windows/${previous_msi_name}" -OutFile $previous_msi_name -PassThru
 }
 
 $msi = (Get-Item "fluent-package\\msi\\repositories\\fluent-package-*.msi") | Sort-Object -Descending { $_.LastWriteTime } | Select-Object -First 1