diff --git a/fluent-package/apt/systemd-test/update-from-v4.sh b/fluent-package/apt/systemd-test/update-from-v4.sh
index 82954763..fb1f32ca 100755
--- a/fluent-package/apt/systemd-test/update-from-v4.sh
+++ b/fluent-package/apt/systemd-test/update-from-v4.sh
@@ -4,18 +4,9 @@ set -exu
 
 . $(dirname $0)/../commonvar.sh
 
-# TODO: Remove it when v5 repository was deployed
-sudo apt install -y curl ca-certificates
-curl -O https://packages.treasuredata.com/4/${distribution}/${code_name}/pool/contrib/f/fluentd-apt-source/fluentd-apt-source_2020.8.25-1_all.deb
-sudo apt install -y ./fluentd-apt-source_2020.8.25-1_all.deb
-
 # Install v4
-sudo apt clean all
-# Uncomment when v5 repository was deployed
-#apt_source_package=/host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-apt-source*_all.deb
-#sudo apt install -V -y ${apt_source_package} ca-certificates
-sudo apt update
-sudo apt install -V -y td-agent=${td_agent_version}-1
+sudo apt install -y curl ca-certificates
+curl -fsSL https://toolbelt.treasuredata.com/sh/install-${distribution}-${code_name}-td-agent4.sh | sh
 
 systemctl status --no-pager td-agent
 
diff --git a/fluent-package/apt/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh b/fluent-package/apt/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh
index 19f392e3..24dd60df 100755
--- a/fluent-package/apt/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh
+++ b/fluent-package/apt/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh
@@ -4,18 +4,9 @@ set -exu
 
 . $(dirname $0)/../commonvar.sh
 
-# TODO: Remove it when v5 repository was deployed
-sudo apt install -y curl ca-certificates
-curl -O https://packages.treasuredata.com/4/${distribution}/${code_name}/pool/contrib/f/fluentd-apt-source/fluentd-apt-source_2020.8.25-1_all.deb
-sudo apt install -y ./fluentd-apt-source_2020.8.25-1_all.deb
-
 # Install v4
-sudo apt clean all
-# Uncomment when v5 repository was deployed
-#apt_source_package=/host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-apt-source*_all.deb
-#sudo apt install -V -y ${apt_source_package} ca-certificates
-sudo apt update
-sudo apt install -V -y td-agent=${td_agent_version}-1
+sudo apt install -y curl ca-certificates
+curl -fsSL https://toolbelt.treasuredata.com/sh/install-${distribution}-${code_name}-td-agent4.sh | sh
 
 systemctl status --no-pager td-agent
 
diff --git a/fluent-package/yum/systemd-test/update-from-v4.sh b/fluent-package/yum/systemd-test/update-from-v4.sh
index 1593893e..39626673 100755
--- a/fluent-package/yum/systemd-test/update-from-v4.sh
+++ b/fluent-package/yum/systemd-test/update-from-v4.sh
@@ -8,24 +8,10 @@ set -exu
 sudo rpm --import https://packages.treasuredata.com/GPG-KEY-td-agent
 case ${distribution} in
     amazon)
-        cat > td.repo <<'EOF';
-[treasuredata]
-name=TreasureData
-baseurl=https://packages.treasuredata.com/4/amazon/$releasever/$basearch
-gpgcheck=1
-gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent
-EOF
-        sudo mv td.repo /etc/yum.repos.d/
+        curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2-td-agent4.sh | sh
         ;;
     *)
-        cat > td.repo <<'EOF';
-[treasuredata]
-name=TreasureData
-baseurl=https://packages.treasuredata.com/4/redhat/$releasever/$basearch
-gpgcheck=1
-gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent
-EOF
-        sudo mv td.repo /etc/yum.repos.d/
+    	curl -fsSL https://toolbelt.treasuredata.com/sh/install-redhat-td-agent4.sh | sh
         ;;
 esac
 sudo $DNF update -y
diff --git a/fluent-package/yum/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh b/fluent-package/yum/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh
index f18dabbb..128fc219 100755
--- a/fluent-package/yum/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh
+++ b/fluent-package/yum/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh
@@ -8,24 +8,10 @@ set -exu
 sudo rpm --import https://packages.treasuredata.com/GPG-KEY-td-agent
 case ${distribution} in
     amazon)
-        cat > td.repo <<'EOF';
-[treasuredata]
-name=TreasureData
-baseurl=https://packages.treasuredata.com/4/amazon/$releasever/$basearch
-gpgcheck=1
-gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent
-EOF
-        sudo mv td.repo /etc/yum.repos.d/
+        curl -fsSL https://toolbelt.treasuredata.com/sh/install-amazon2-td-agent4.sh | sh
         ;;
     *)
-        cat > td.repo <<'EOF';
-[treasuredata]
-name=TreasureData
-baseurl=https://packages.treasuredata.com/4/redhat/$releasever/$basearch
-gpgcheck=1
-gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent
-EOF
-        sudo mv td.repo /etc/yum.repos.d/
+    	curl -fsSL https://toolbelt.treasuredata.com/sh/install-redhat-td-agent4.sh | sh
         ;;
 esac
 sudo $DNF update -y