diff --git a/.circleci/config.yml b/.circleci/config.yml
index daae8ed2d5b..116370e2dcf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -171,14 +171,14 @@ jobs:
             MINOR_VER=$(echo "${CIRCLE_TAG}" | sed -E 's/([0-9.]*)[_-]?(.*)/\2/')
             RELEASE_NOTE_FILE=$(echo "${MAJOR_VER}_${MINOR_VER}_note.txt" | sed "s/\./_/")
             echo "Generating manifest file..."
-            echo "DSL-AC68U#FW${MAJOR_VER}#EXT${MINOR_VER}#BETAFW0#BETAEXT0#"       > ${UPDATE_DIR}/manifest.txt
-            echo "DSL-AX82U#FW${MAJOR_VER}#EXT${MINOR_VER}#BETAFW0#BETAEXT0#"      >> ${UPDATE_DIR}/manifest.txt
-            echo "RT-AX82U#FW${MAJOR_VER}#EXT${MINOR_VER}#BETAFW0#BETAEXT0#"       >> ${UPDATE_DIR}/manifest.txt
-            echo "RT-AX82U_V2#FW${MAJOR_VER}#EXT${MINOR_VER}#BETAFW0#BETAEXT0#"    >> ${UPDATE_DIR}/manifest.txt
-            echo "TUF-AX5400#FW${MAJOR_VER}#EXT${MINOR_VER}#BETAFW0#BETAEXT0#"     >> ${UPDATE_DIR}/manifest.txt
-            echo "TUF-AX3000#FW${MAJOR_VER}#EXT${MINOR_VER}#BETAFW0#BETAEXT0#"     >> ${UPDATE_DIR}/manifest.txt
-            echo "RT-AX95Q#FW${MAJOR_VER}#EXT${MINOR_VER}#BETAFW0#BETAEXT0#"       >> ${UPDATE_DIR}/manifest.txt
-            echo "RT-AXE95Q#FW${MAJOR_VER}#EXT${MINOR_VER}#BETAFW0#BETAEXT0#"      >> ${UPDATE_DIR}/manifest.txt
+            echo "DSL-AC68U#FW${MAJOR_VER}#EXT${MINOR_VER}"       > ${UPDATE_DIR}/manifest2.txt
+            echo "DSL-AX82U#FW${MAJOR_VER}#EXT${MINOR_VER}"      >> ${UPDATE_DIR}/manifest2.txt
+            echo "RT-AX82U#FW${MAJOR_VER}#EXT${MINOR_VER}"       >> ${UPDATE_DIR}/manifest2.txt
+            echo "RT-AX82U_V2#FW${MAJOR_VER}#EXT${MINOR_VER}"    >> ${UPDATE_DIR}/manifest2.txt
+            echo "TUF-AX5400#FW${MAJOR_VER}#EXT${MINOR_VER}"     >> ${UPDATE_DIR}/manifest2.txt
+            echo "TUF-AX3000#FW${MAJOR_VER}#EXT${MINOR_VER}"     >> ${UPDATE_DIR}/manifest2.txt
+            echo "RT-AX95Q#FW${MAJOR_VER}#EXT${MINOR_VER}"       >> ${UPDATE_DIR}/manifest2.txt
+            echo "RT-AXE95Q#FW${MAJOR_VER}#EXT${MINOR_VER}"      >> ${UPDATE_DIR}/manifest2.txt
             
             cp $HOME/project/workspace/release/CHANGELOG ${UPDATE_DIR}/"${RELEASE_NOTE_FILE}"
             echo "Uploading to github manifest and ${RELEASE_NOTE_FILE}"
diff --git a/release/src/router/rom/webs_scripts/merlin_webs_update.sh b/release/src/router/rom/webs_scripts/merlin_webs_update.sh
index 2567671f9b6..3677d31291d 100755
--- a/release/src/router/rom/webs_scripts/merlin_webs_update.sh
+++ b/release/src/router/rom/webs_scripts/merlin_webs_update.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-
+set -x;
 wget_options="-q -t 2 -T 30"
 
-fwsite="https://fwupdate.asuswrt-merlin.net"
+fwsite="https://raw.githubusercontent.com/gnuton/asuswrt-merlin.ng/master/updates/"
 
 nvram set webs_state_update=0 # INITIALIZING
 nvram set webs_state_flag=0   # 0: Don't do upgrade  1: Do upgrade