7 files changed, 12 insertions, 5 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml
index 5c83a660..8a4ef9d0 100644
--- a/data/architectures/amd64.toml
+++ b/data/architectures/amd64.toml
@@ -1,5 +1,5 @@
 additional_repositories = [
-  "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3005 bullseye main",
+  "deb [arch=amd64] https://packages.vyos.net/saltproject/debian/11/amd64/3005 bullseye main",
   "deb https://repo.zabbix.com/zabbix/6.0/debian bookworm main"
 ]
 
diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml
index c64e19a1..bf9ef8ee 100644
--- a/data/architectures/arm64.toml
+++ b/data/architectures/arm64.toml
@@ -1,5 +1,5 @@
 additional_repositories = [
-  "deb [arch=arm64] https://repo.saltproject.io/py3/debian/11/arm64/3005 bullseye main",
+  "deb [arch=arm64] https://packages.vyos.net/saltproject/debian/11/arm64/3005 bullseye main",
   "deb https://repo.zabbix.com/zabbix/6.0/debian-arm64 bookworm main"
 ]
 
diff --git a/data/architectures/armhf.toml b/data/architectures/armhf.toml
index de5e62f4..8cf2d763 100644
--- a/data/architectures/armhf.toml
+++ b/data/architectures/armhf.toml
@@ -1,5 +1,5 @@
 additional_repositories = [
-  "deb [arch=armhf] https://repo.saltproject.io/py3/debian/11/armhf/3005 bullseye main"
+  "deb [arch=armhf] https://packages.vyos.net/saltproject/debian/11/arm64/3005 bullseye main"
 ]
 
 # Packages included in armhf images by default
diff --git a/scripts/package-build/netfilter/.gitignore b/scripts/package-build/netfilter/.gitignore
index 9bf39f82..c6444404 100644
--- a/scripts/package-build/netfilter/.gitignore
+++ b/scripts/package-build/netfilter/.gitignore
@@ -5,4 +5,4 @@
 *.changes
 *.deb
 *.dsc
-
+*.tar.gz
diff --git a/scripts/package-build/netfilter/build.py b/scripts/package-build/netfilter/build.py
index 9737b7d3..d15b5770 100755
--- a/scripts/package-build/netfilter/build.py
+++ b/scripts/package-build/netfilter/build.py
@@ -112,6 +112,12 @@ def build_package(package: dict, dependencies: list, patch_dir: Path) -> None:
         # Apply patches if any
         apply_patches(repo_dir, patch_dir, repo_name)
 
+        # Sanitize the commit ID and build a tarball for the package
+        commit_id_sanitized = package['commit_id'].replace('/', '_')
+        tarball_name = f"{repo_name}_{commit_id_sanitized}.tar.gz"
+        run(['tar', '-czf', tarball_name, '-C', str(repo_dir.parent), repo_name], check=True)
+        print(f"I: Tarball created: {tarball_name}")
+
         # Prepare the package if required
         if package.get('prepare_package', False):
             prepare_package(repo_dir, package.get('install_data', ''))
diff --git a/scripts/package-build/openvpn-otp/.gitignore b/scripts/package-build/openvpn-otp/.gitignore
index 7f89da2b..60dd3cad 100644
--- a/scripts/package-build/openvpn-otp/.gitignore
+++ b/scripts/package-build/openvpn-otp/.gitignore
@@ -4,3 +4,4 @@ openvpn-otp/
 *.changes
 *.deb
 *.dsc
+*.tar.gz
diff --git a/scripts/package-build/openvpn-otp/package.toml b/scripts/package-build/openvpn-otp/package.toml
index 72209ad1..bdbc6d9d 100644
--- a/scripts/package-build/openvpn-otp/package.toml
+++ b/scripts/package-build/openvpn-otp/package.toml
@@ -1,6 +1,6 @@
 [[packages]]
 name = "openvpn-otp"
-commit_id = "master"
+commit_id = "9781ff1"
 scm_url = "https://github.com/evgeny-gridasov/openvpn-otp"
 
 # build_cmd = "cd ..; ./build-openvpn-otp.sh"