diff --git a/.github/workflows/apt.yml b/.github/workflows/apt.yml
index 9a9dd44b..e8e110f0 100644
--- a/.github/workflows/apt.yml
+++ b/.github/workflows/apt.yml
@@ -46,21 +46,16 @@ jobs:
       - name: Build deb with Docker
         run: |
           rake apt:build APT_TARGETS=${{ matrix.rake-job }}
+      - uses: actions/checkout@master
+        with:
+          path: v6-test
       - name: Build v6 deb with Docker
         run: |
+          cd v6-test
           git config user.email "fluentd@googlegroups.com"
           git config user.name "Fluentd developers"
           git am fluent-package/bump-version-v6.patch
           rake apt:build APT_TARGETS=${{ matrix.rake-job }}
-      - name: Relocate packages
-        run: |
-          cp -r fluent-package/apt/repositories fluent-package/apt/v6repositories
-          find fluent-package/apt/repositories -name 'fluent-package_6*.deb' | xargs rm -f
-          find fluent-package/apt/repositories -name 'fluent-package-dbgsym_6*.deb' | xargs rm -f
-          find fluent-package/apt/repositories -name 'td-agent_6*.deb' | xargs rm -f
-          find fluent-package/apt/v6repositories -name 'fluent-package_5*.deb' | xargs rm -f
-          find fluent-package/apt/v6repositories -name 'fluent-package-dbgsym_5*.deb' | xargs rm -f
-          find fluent-package/apt/v6repositories -name 'td-agent_5*.deb' | xargs rm -f
       - name: Upload fluent-package deb
         uses: actions/upload-artifact@master
         with:
@@ -70,7 +65,7 @@ jobs:
         uses: actions/upload-artifact@master
         with:
           name: v6-packages-${{ matrix.rake-job }}
-          path: fluent-package/apt/v6repositories
+          path: v6-test/fluent-package/apt/repositories
       - name: Upload fluent-apt-source deb
         uses: actions/upload-artifact@master
         with:
@@ -204,7 +199,7 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: v6-packages-${{ matrix.rake-job }}
-          path: v6repositories
+          path: v6-test
       - uses: actions/download-artifact@v4
         with:
           name: packages-apt-source-${{ matrix.rake-job }}
diff --git a/.github/workflows/yum.yml b/.github/workflows/yum.yml
index 546e7e2c..4b4ef9fe 100644
--- a/.github/workflows/yum.yml
+++ b/.github/workflows/yum.yml
@@ -46,21 +46,16 @@ jobs:
       - name: Build rpm with Docker
         run: |
           rake yum:build YUM_TARGETS=${{ matrix.rake-job }}
+      - uses: actions/checkout@master
+        with:
+          path: v6-test
       - name: Build v6 rpm with Docker
         run: |
+          cd v6-test
           git config user.email "fluentd@googlegroups.com"
           git config user.name "Fluentd developers"
           git am fluent-package/bump-version-v6.patch
           rake yum:build YUM_TARGETS=${{ matrix.rake-job }}
-      - name: Relocate packages
-        run: |
-          cp -r fluent-package/yum/repositories fluent-package/yum/v6repositories
-          find fluent-package/yum/repositories -name 'fluent-package-6*.rpm' | xargs rm -f
-          find fluent-package/yum/repositories -name 'fluent-package-debug*-6*.rpm' | xargs rm -f
-          find fluent-package/yum/repositories -name 'td-agent_6*.rpm' | xargs rm -f
-          find fluent-package/yum/v6repositories -name 'fluent-package-5*.rpm' | xargs rm -f
-          find fluent-package/yum/v6repositories -name 'fluent-package-debug*-5*.rpm' | xargs rm -f
-          find fluent-package/yum/v6repositories -name 'td-agent-5*.rpm' | xargs rm -f
       - name: Upload fluent-package rpm
         uses: actions/upload-artifact@v4
         with:
@@ -70,7 +65,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: v6-packages-${{ matrix.rake-job }}
-          path: fluent-package/yum/v6repositories
+          path: v6-test/fluent-package/yum/repositories
       # TODO move the following steps to "Test" job
       - name: Check Package Size
         run: |
@@ -164,7 +159,7 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: v6-packages-${{ matrix.rake-job }}
-          path: v6repositories
+          path: v6-test
       - uses: canonical/setup-lxd@v0.1.1
       - name: Run Test ${{ matrix.test }} on ${{ matrix.lxc-image }}
         run: fluent-package/yum/systemd-test/test.sh ${{ matrix.lxc-image }} ${{ matrix.test }}
@@ -208,7 +203,7 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: v6-packages-${{ matrix.rake-job }}
-          path: v6repositories
+          path: v6-test
       - uses: canonical/setup-lxd@v0.1.1
       - name: Run Test ${{ matrix.test }} on ${{ matrix.lxc-image }}
         run: fluent-package/yum/systemd-test/test.sh ${{ matrix.lxc-image }} ${{ matrix.test }}
diff --git a/fluent-package/apt/systemd-test/update-to-next-major-version.sh b/fluent-package/apt/systemd-test/update-to-next-major-version.sh
index 24aaacda..125b8c60 100755
--- a/fluent-package/apt/systemd-test/update-to-next-major-version.sh
+++ b/fluent-package/apt/systemd-test/update-to-next-major-version.sh
@@ -14,7 +14,7 @@ sudo /opt/fluent/bin/fluent-gem install --no-document linux-utmpx
 
 # Install next major version
 sudo apt install -V -y \
-    /host/v6repositories/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb
+    /host/v6-test/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb
 
 # Test: Check whether plugin/gem were installed during upgrading
 /opt/fluent/bin/fluent-gem list | grep fluent-plugin-concat
diff --git a/fluent-package/yum/systemd-test/update-to-next-major-version.sh b/fluent-package/yum/systemd-test/update-to-next-major-version.sh
index e2af798d..ea4680cd 100755
--- a/fluent-package/yum/systemd-test/update-to-next-major-version.sh
+++ b/fluent-package/yum/systemd-test/update-to-next-major-version.sh
@@ -13,7 +13,7 @@ sudo /opt/fluent/bin/fluent-gem install --no-document fluent-plugin-concat
 sudo /opt/fluent/bin/fluent-gem install --no-document linux-utmpx
 
 # Install next major version
-package="/host/v6repositories/${distribution}/${DISTRIBUTION_VERSION}/x86_64/Packages/fluent-package-*.rpm"
+package="/host/v6-test/${distribution}/${DISTRIBUTION_VERSION}/x86_64/Packages/fluent-package-*.rpm"
 sudo $DNF install -y $package
 
 # Test: Check whether plugin/gem were installed during upgrading