diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e1f7aa2..3c35394 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -76,7 +76,7 @@ jobs:
             if [ "$1" = "centos" ]; then
               wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-centos
             else
-              wget -t 3 -T 30 -nv -O vpnsetup.sh https://raw.githubusercontent.com/hwdsl2/setup-ipsec-vpn/master/vpnsetup_amzn.sh
+              wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-amzn
             fi
           else
             export DEBIAN_FRONTEND=noninteractive
@@ -87,6 +87,7 @@ jobs:
             wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup
           fi
 
+          sed -i '/swan_ver_url/s/^/#/' vpnsetup.sh
           sh vpnsetup.sh
           if [ "$1" = "centos" ] || [ "$1" = "amazon" ]; then
             systemctl start ipsec
@@ -172,15 +173,43 @@ jobs:
             if [ "$1" = "centos" ]; then
               wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade-centos
             else
-              wget -t 3 -T 30 -nv -O vpnupgrade.sh https://github.com/hwdsl2/setup-ipsec-vpn/raw/master/extras/vpnupgrade_amzn.sh
+              wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade-amzn
             fi
           else
             sed -i '/pluto/d' /var/log/auth.log
             pkill -HUP rsyslog
             wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade
           fi
+
+          sed -i '/swan_ver_url/s/^/#/' vpnupgrade.sh
+          sed -i '/^SWAN_VER=/s/4.1/3.32/' vpnupgrade.sh
           sh vpnupgrade.sh <<ANSWERS
           y
+          ANSWERS
+
+          if [ "$1" = "centos" ] || [ "$1" = "amazon" ]; then
+            systemctl restart ipsec
+            sleep 10
+            grep pluto /var/log/secure
+          else
+            sleep 10
+            grep pluto /var/log/auth.log
+          fi
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+          ipsec status | grep -q ikev2-cp
+
+          if [ "$1" = "centos" ] || [ "$1" = "amazon" ]; then
+            sed -i '/pluto/d' /var/log/secure
+            pkill -HUP rsyslog
+          else
+            sed -i '/pluto/d' /var/log/auth.log
+            pkill -HUP rsyslog
+          fi
+
+          sed -i '/^SWAN_VER=/s/3.32/4.1/' vpnupgrade.sh
+          sh vpnupgrade.sh <<ANSWERS
           y
           ANSWERS
 
@@ -282,6 +311,7 @@ jobs:
           service rsyslog start
           wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup
 
+          sed -i '/swan_ver_url/s/^/#/' vpnsetup.sh
           sh vpnsetup.sh
 
           sleep 5
@@ -342,9 +372,27 @@ jobs:
 
           sed -i '/pluto/d' /var/log/auth.log
           pkill -HUP rsyslog
+
           wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade
+
+          sed -i '/swan_ver_url/s/^/#/' vpnupgrade.sh
+          sed -i '/^SWAN_VER=/s/4.1/3.32/' vpnupgrade.sh
           sh vpnupgrade.sh <<ANSWERS
           y
+          ANSWERS
+
+          sleep 10
+          grep pluto /var/log/auth.log
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+          ipsec status | grep -q ikev2-cp
+
+          sed -i '/pluto/d' /var/log/auth.log
+          pkill -HUP rsyslog
+
+          sed -i '/^SWAN_VER=/s/3.32/4.1/' vpnupgrade.sh
+          sh vpnupgrade.sh <<ANSWERS
           y
           ANSWERS