diff --git a/SPECS-EXTENDED/ripgrep/generate_source_tarball.sh b/SPECS-EXTENDED/ripgrep/generate_source_tarball.sh
new file mode 100755
index 00000000000..2c745954d4c
--- /dev/null
+++ b/SPECS-EXTENDED/ripgrep/generate_source_tarball.sh
@@ -0,0 +1,151 @@
+#!/bin/bash
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Quit on failure
+set -e
+
+PKG_VERSION=""
+SRC_TARBALL=""
+OUT_FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+VENDOR_VERSION="1"
+
+# parameters:
+#
+# --srcTarball  : src tarball file
+#                 this file contains the 'initial' source code of the component
+#                 and should be replaced with the new/modified src code
+# --outFolder   : folder where to copy the new tarball(s)
+# --pkgVersion  : package version
+# --vendorVersion : vendor version
+
+PARAMS=""
+while (( "$#" )); do
+    case "$1" in
+        --srcTarball)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            SRC_TARBALL=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --outFolder)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            OUT_FOLDER=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --pkgVersion)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            PKG_VERSION=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --vendorVersion)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            VENDOR_VERSION=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        -*|--*=) # unsupported flags
+        echo "Error: Unsupported flag $1" >&2
+        exit 1
+        ;;
+        *) # preserve positional arguments
+        PARAMS="$PARAMS $1"
+        shift
+        ;;
+  esac
+done
+
+echo "--srcTarball      -> $SRC_TARBALL"
+echo "--outFolder       -> $OUT_FOLDER"
+echo "--pkgVersion      -> $PKG_VERSION"
+echo "--vendorVersion   -> $VENDOR_VERSION"
+
+if [ -z "$PKG_VERSION" ]; then
+    echo "--pkgVersion parameter cannot be empty"
+    exit 1
+fi
+
+if [ -z "$VENDOR_VERSION" ]; then
+    echo "--vendorVersion parameter cannot be empty"
+    exit 1
+fi
+
+echo "-- create temp folder"
+TEMP_DIR=$(mktemp -d)
+function cleanup {
+    echo "+++ cleanup -> remove $TEMP_DIR"
+    rm -rf $TEMP_DIR
+}
+trap cleanup EXIT
+
+pushd $TEMP_DIR > /dev/null
+
+TARBALL_NAME=$(basename "$SRC_TARBALL")
+
+NAME_VER=${TARBALL_NAME%.*}
+if [[ "$NAME_VER" =~ \.tar$ ]]
+then
+    NAME_VER=${NAME_VER%.*}
+fi
+
+VENDOR_TARBALL="$NAME_VER-cargovendor-v$VENDOR_VERSION.tar.gz"
+
+if [[ -f "$TARBALL_NAME" ]]
+then
+    cp "$SRC_TARBALL" "$TEMP_DIR"
+else
+    echo "Tarball '$TARBALL_NAME' doesn't exist. Will attempt to download from blobstorage."
+    if ! wget -q "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/$TARBALL_NAME" -O "$TEMP_DIR/$TARBALL_NAME"
+    then
+        echo "ERROR: failed to download the source tarball."
+        exit 1
+    fi
+    echo "Download successful."
+fi
+
+echo "Unpacking source tarball..."
+tar -xf $SRC_TARBALL
+
+echo "Vendor cargo ..."
+DIRECTORY_NAME=($(ls -d */))
+
+# assume there is only one directory in the tarball
+DIRECTORY_NAME=${DIRECTORY_NAME[0]%//}
+
+pushd "$DIRECTORY_NAME" &> /dev/null
+echo "Fetching dependencies to a temporary cache in $DIRECTORY_NAME."
+
+#TODO: installing rust as auto-patcher does not have it installed by default. Possibly remove if auto-patcher will be changed to have rust included.
+sudo dnf install -y rust || sudo apt install -y rustc
+
+# assume there is only one Cargo.toml
+TOML_LOCATION=$(find . -maxdepth 2 -name "Cargo.toml" -exec dirname {} \;)
+pushd $TOML_LOCATION &> /dev/null
+cargo vendor > config.toml
+
+echo ""
+echo "========================="
+echo "Tar vendored tarball"
+tar  --sort=name \
+     --mtime="2021-04-26 00:00Z" \
+     --owner=0 --group=0 --numeric-owner \
+     --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
+     -I pigz -cf "$VENDOR_TARBALL" vendor
+
+cp $VENDOR_TARBALL $OUT_FOLDER
+popd > /dev/null
+echo "$NAME_VER vendored modules are available at $VENDOR_TARBALL"
diff --git a/SPECS-EXTENDED/rust-cbindgen/generate_source_tarball.sh b/SPECS-EXTENDED/rust-cbindgen/generate_source_tarball.sh
new file mode 100755
index 00000000000..2c745954d4c
--- /dev/null
+++ b/SPECS-EXTENDED/rust-cbindgen/generate_source_tarball.sh
@@ -0,0 +1,151 @@
+#!/bin/bash
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Quit on failure
+set -e
+
+PKG_VERSION=""
+SRC_TARBALL=""
+OUT_FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+VENDOR_VERSION="1"
+
+# parameters:
+#
+# --srcTarball  : src tarball file
+#                 this file contains the 'initial' source code of the component
+#                 and should be replaced with the new/modified src code
+# --outFolder   : folder where to copy the new tarball(s)
+# --pkgVersion  : package version
+# --vendorVersion : vendor version
+
+PARAMS=""
+while (( "$#" )); do
+    case "$1" in
+        --srcTarball)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            SRC_TARBALL=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --outFolder)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            OUT_FOLDER=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --pkgVersion)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            PKG_VERSION=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --vendorVersion)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            VENDOR_VERSION=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        -*|--*=) # unsupported flags
+        echo "Error: Unsupported flag $1" >&2
+        exit 1
+        ;;
+        *) # preserve positional arguments
+        PARAMS="$PARAMS $1"
+        shift
+        ;;
+  esac
+done
+
+echo "--srcTarball      -> $SRC_TARBALL"
+echo "--outFolder       -> $OUT_FOLDER"
+echo "--pkgVersion      -> $PKG_VERSION"
+echo "--vendorVersion   -> $VENDOR_VERSION"
+
+if [ -z "$PKG_VERSION" ]; then
+    echo "--pkgVersion parameter cannot be empty"
+    exit 1
+fi
+
+if [ -z "$VENDOR_VERSION" ]; then
+    echo "--vendorVersion parameter cannot be empty"
+    exit 1
+fi
+
+echo "-- create temp folder"
+TEMP_DIR=$(mktemp -d)
+function cleanup {
+    echo "+++ cleanup -> remove $TEMP_DIR"
+    rm -rf $TEMP_DIR
+}
+trap cleanup EXIT
+
+pushd $TEMP_DIR > /dev/null
+
+TARBALL_NAME=$(basename "$SRC_TARBALL")
+
+NAME_VER=${TARBALL_NAME%.*}
+if [[ "$NAME_VER" =~ \.tar$ ]]
+then
+    NAME_VER=${NAME_VER%.*}
+fi
+
+VENDOR_TARBALL="$NAME_VER-cargovendor-v$VENDOR_VERSION.tar.gz"
+
+if [[ -f "$TARBALL_NAME" ]]
+then
+    cp "$SRC_TARBALL" "$TEMP_DIR"
+else
+    echo "Tarball '$TARBALL_NAME' doesn't exist. Will attempt to download from blobstorage."
+    if ! wget -q "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/$TARBALL_NAME" -O "$TEMP_DIR/$TARBALL_NAME"
+    then
+        echo "ERROR: failed to download the source tarball."
+        exit 1
+    fi
+    echo "Download successful."
+fi
+
+echo "Unpacking source tarball..."
+tar -xf $SRC_TARBALL
+
+echo "Vendor cargo ..."
+DIRECTORY_NAME=($(ls -d */))
+
+# assume there is only one directory in the tarball
+DIRECTORY_NAME=${DIRECTORY_NAME[0]%//}
+
+pushd "$DIRECTORY_NAME" &> /dev/null
+echo "Fetching dependencies to a temporary cache in $DIRECTORY_NAME."
+
+#TODO: installing rust as auto-patcher does not have it installed by default. Possibly remove if auto-patcher will be changed to have rust included.
+sudo dnf install -y rust || sudo apt install -y rustc
+
+# assume there is only one Cargo.toml
+TOML_LOCATION=$(find . -maxdepth 2 -name "Cargo.toml" -exec dirname {} \;)
+pushd $TOML_LOCATION &> /dev/null
+cargo vendor > config.toml
+
+echo ""
+echo "========================="
+echo "Tar vendored tarball"
+tar  --sort=name \
+     --mtime="2021-04-26 00:00Z" \
+     --owner=0 --group=0 --numeric-owner \
+     --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
+     -I pigz -cf "$VENDOR_TARBALL" vendor
+
+cp $VENDOR_TARBALL $OUT_FOLDER
+popd > /dev/null
+echo "$NAME_VER vendored modules are available at $VENDOR_TARBALL"
diff --git a/SPECS/flux/generate_source_tarball.sh b/SPECS/flux/generate_source_tarball.sh
index 9406a940230..2c745954d4c 100755
--- a/SPECS/flux/generate_source_tarball.sh
+++ b/SPECS/flux/generate_source_tarball.sh
@@ -96,13 +96,13 @@ pushd $TEMP_DIR > /dev/null
 
 TARBALL_NAME=$(basename "$SRC_TARBALL")
 
-PKG_NAME=${TARBALL_NAME%.*}
-if [[ "$PKG_NAME" =~ \.tar$ ]]
+NAME_VER=${TARBALL_NAME%.*}
+if [[ "$NAME_VER" =~ \.tar$ ]]
 then
-    PKG_NAME=${PKG_NAME%.*}
+    NAME_VER=${NAME_VER%.*}
 fi
 
-VENDOR_TARBALL="$PKG_NAME-$PKG_VERSION-cargovendor-v$VENDOR_VERSION.tar.gz"
+VENDOR_TARBALL="$NAME_VER-cargovendor-v$VENDOR_VERSION.tar.gz"
 
 if [[ -f "$TARBALL_NAME" ]]
 then
@@ -117,8 +117,6 @@ else
     echo "Download successful."
 fi
 
-NAME_VER="$PKG_NAME-$PKG_VERSION"
-
 echo "Unpacking source tarball..."
 tar -xf $SRC_TARBALL
 
@@ -132,7 +130,7 @@ pushd "$DIRECTORY_NAME" &> /dev/null
 echo "Fetching dependencies to a temporary cache in $DIRECTORY_NAME."
 
 #TODO: installing rust as auto-patcher does not have it installed by default. Possibly remove if auto-patcher will be changed to have rust included.
-sudo apt install -y rustc
+sudo dnf install -y rust || sudo apt install -y rustc
 
 # assume there is only one Cargo.toml
 TOML_LOCATION=$(find . -maxdepth 2 -name "Cargo.toml" -exec dirname {} \;)
@@ -148,5 +146,6 @@ tar  --sort=name \
      --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
      -I pigz -cf "$VENDOR_TARBALL" vendor
 
+cp $VENDOR_TARBALL $OUT_FOLDER
 popd > /dev/null
-echo "$PKG_NAME vendored modules are available at $VENDOR_TARBALL"
+echo "$NAME_VER vendored modules are available at $VENDOR_TARBALL"
diff --git a/SPECS/virtiofsd/generate_source_tarball.sh b/SPECS/virtiofsd/generate_source_tarball.sh
index 9406a940230..2c745954d4c 100755
--- a/SPECS/virtiofsd/generate_source_tarball.sh
+++ b/SPECS/virtiofsd/generate_source_tarball.sh
@@ -96,13 +96,13 @@ pushd $TEMP_DIR > /dev/null
 
 TARBALL_NAME=$(basename "$SRC_TARBALL")
 
-PKG_NAME=${TARBALL_NAME%.*}
-if [[ "$PKG_NAME" =~ \.tar$ ]]
+NAME_VER=${TARBALL_NAME%.*}
+if [[ "$NAME_VER" =~ \.tar$ ]]
 then
-    PKG_NAME=${PKG_NAME%.*}
+    NAME_VER=${NAME_VER%.*}
 fi
 
-VENDOR_TARBALL="$PKG_NAME-$PKG_VERSION-cargovendor-v$VENDOR_VERSION.tar.gz"
+VENDOR_TARBALL="$NAME_VER-cargovendor-v$VENDOR_VERSION.tar.gz"
 
 if [[ -f "$TARBALL_NAME" ]]
 then
@@ -117,8 +117,6 @@ else
     echo "Download successful."
 fi
 
-NAME_VER="$PKG_NAME-$PKG_VERSION"
-
 echo "Unpacking source tarball..."
 tar -xf $SRC_TARBALL
 
@@ -132,7 +130,7 @@ pushd "$DIRECTORY_NAME" &> /dev/null
 echo "Fetching dependencies to a temporary cache in $DIRECTORY_NAME."
 
 #TODO: installing rust as auto-patcher does not have it installed by default. Possibly remove if auto-patcher will be changed to have rust included.
-sudo apt install -y rustc
+sudo dnf install -y rust || sudo apt install -y rustc
 
 # assume there is only one Cargo.toml
 TOML_LOCATION=$(find . -maxdepth 2 -name "Cargo.toml" -exec dirname {} \;)
@@ -148,5 +146,6 @@ tar  --sort=name \
      --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
      -I pigz -cf "$VENDOR_TARBALL" vendor
 
+cp $VENDOR_TARBALL $OUT_FOLDER
 popd > /dev/null
-echo "$PKG_NAME vendored modules are available at $VENDOR_TARBALL"
+echo "$NAME_VER vendored modules are available at $VENDOR_TARBALL"
diff --git a/toolkit/scripts/build_cargo_cache.sh b/toolkit/scripts/build_cargo_cache.sh
index 9406a940230..2c745954d4c 100755
--- a/toolkit/scripts/build_cargo_cache.sh
+++ b/toolkit/scripts/build_cargo_cache.sh
@@ -96,13 +96,13 @@ pushd $TEMP_DIR > /dev/null
 
 TARBALL_NAME=$(basename "$SRC_TARBALL")
 
-PKG_NAME=${TARBALL_NAME%.*}
-if [[ "$PKG_NAME" =~ \.tar$ ]]
+NAME_VER=${TARBALL_NAME%.*}
+if [[ "$NAME_VER" =~ \.tar$ ]]
 then
-    PKG_NAME=${PKG_NAME%.*}
+    NAME_VER=${NAME_VER%.*}
 fi
 
-VENDOR_TARBALL="$PKG_NAME-$PKG_VERSION-cargovendor-v$VENDOR_VERSION.tar.gz"
+VENDOR_TARBALL="$NAME_VER-cargovendor-v$VENDOR_VERSION.tar.gz"
 
 if [[ -f "$TARBALL_NAME" ]]
 then
@@ -117,8 +117,6 @@ else
     echo "Download successful."
 fi
 
-NAME_VER="$PKG_NAME-$PKG_VERSION"
-
 echo "Unpacking source tarball..."
 tar -xf $SRC_TARBALL
 
@@ -132,7 +130,7 @@ pushd "$DIRECTORY_NAME" &> /dev/null
 echo "Fetching dependencies to a temporary cache in $DIRECTORY_NAME."
 
 #TODO: installing rust as auto-patcher does not have it installed by default. Possibly remove if auto-patcher will be changed to have rust included.
-sudo apt install -y rustc
+sudo dnf install -y rust || sudo apt install -y rustc
 
 # assume there is only one Cargo.toml
 TOML_LOCATION=$(find . -maxdepth 2 -name "Cargo.toml" -exec dirname {} \;)
@@ -148,5 +146,6 @@ tar  --sort=name \
      --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
      -I pigz -cf "$VENDOR_TARBALL" vendor
 
+cp $VENDOR_TARBALL $OUT_FOLDER
 popd > /dev/null
-echo "$PKG_NAME vendored modules are available at $VENDOR_TARBALL"
+echo "$NAME_VER vendored modules are available at $VENDOR_TARBALL"