diff --git a/tools/check_changes.sh b/tools/check_changes.sh
index fe92a27..6671aa1 100755
--- a/tools/check_changes.sh
+++ b/tools/check_changes.sh
@@ -36,7 +36,7 @@
 
 touch "${OSM_CHANGES_FOLDER}/osm_changes-${BRANCH}-from${FROM_REF}-to${TO_REF}.log"
 
-modules="common devops IM LCM MON N2VC NBI NG-UI osmclient RO PLA POL SOL003 SOL005 tests"
+modules="common devops IM LCM MON N2VC NBI NG-SA NG-UI osmclient RO PLA POL SOL003 SOL005 tests"
 for repo in $modules; do
     echo ${repo}
     git -C ${OSM_CHANGES_FOLDER} clone "https://osm.etsi.org/gerrit/osm/${repo}"
diff --git a/tools/deletetag.sh b/tools/deletetag.sh
index 754b9b3..4581462 100755
--- a/tools/deletetag.sh
+++ b/tools/deletetag.sh
@@ -25,7 +25,7 @@
 tag_header="OSM Release TWO:"
 tag_message="$tag_header version $TAG"
 
-modules="common devops IM LCM MON N2VC NBI NG-UI osmclient RO PLA POL SOL003 SOL005 tests"
+modules="common devops IM LCM MON N2VC NBI NG-UI NG-SA osmclient RO PLA POL SOL003 SOL005 tests"
 list=""
 for i in $modules; do
     if [ "$1" == "$i" -o "$1" == "all" ]; then
diff --git a/tools/env-ftp b/tools/env-ftp
index fafb2be..156fc9c 100644
--- a/tools/env-ftp
+++ b/tools/env-ftp
@@ -17,7 +17,7 @@
 #######################################################################################
 
 SERVER="ftp://osm-download.etsi.org"
-FOLDER="osm-12.0-twelve"
+FOLDER="osm-13.0-thirteen"
 FTP_OPTS=""
 
 # Define your FTP credentials in a separate (private file)
diff --git a/tools/gen-repo.sh b/tools/gen-repo.sh
index b5dec97..a7cf904 100755
--- a/tools/gen-repo.sh
+++ b/tools/gen-repo.sh
@@ -52,7 +52,7 @@
     echo "BUILD_NUMBER:   $BUILD_NUMBER"
 }
 
-MDG_REPOS="RO osmclient openvim SO UI IM devops MON N2VC NBI common POL PLA LW-UI NG-UI"
+MDG_REPOS="RO osmclient openvim SO UI IM devops MON N2VC NBI common POL PLA LW-UI NG-UI NG-SA"
 IN_REPO="unstable"
 OUT_REPO="stable"
 GPGKEY=71C0472C
diff --git a/tools/local-build.sh b/tools/local-build.sh
index ce686c8..9f872d2 100755
--- a/tools/local-build.sh
+++ b/tools/local-build.sh
@@ -177,7 +177,7 @@
 
 function stage_2() {
     print_section "Performing Stage 2"
-    MODULES="common devops IM LCM MON N2VC NBI NG-UI osmclient PLA POL RO tests"
+    MODULES="common devops IM LCM MON N2VC NBI NG-UI NG-SA osmclient PLA POL RO tests"
     if [ ! -z ${1} ] ; then
         POSSIBLE_MODULES=$(echo ${1} | sed "s/,/ /g")
         for MODULE in ${POSSIBLE_MODULES}; do
diff --git a/tools/newbranch.sh b/tools/newbranch.sh
index ad6e8d6..ccefd99 100755
--- a/tools/newbranch.sh
+++ b/tools/newbranch.sh
@@ -26,7 +26,7 @@
 USER="$3"
 tag_message="Start of $BRANCH"
 
-modules="common devops IM LCM MON N2VC NBI osmclient RO POL NG-UI PLA tests"
+modules="common devops IM LCM MON N2VC NBI NG-UI NG-SA osmclient RO PLA POL SOL003 SOL005 tests"
 list=""
 for i in $modules; do
     if [ "$1" == "$i" -o "$1" == "all" ]; then
diff --git a/tools/newtag.sh b/tools/newtag.sh
index 0638fc7..249c277 100755
--- a/tools/newtag.sh
+++ b/tools/newtag.sh
@@ -29,7 +29,7 @@
 tag_header="OSM Release $RELEASE_NAME:"
 tag_message="$tag_header version $TAG"
 
-modules="common devops IM LCM MON N2VC NBI NG-UI osmclient RO PLA POL SOL003 SOL005 tests"
+modules="common devops IM LCM MON N2VC NBI NG-UI NG-SA osmclient RO PLA POL SOL003 SOL005 tests"
 list=""
 for i in $modules; do
     if [ "$1" == "$i" -o "$1" == "all" ]; then