diff --git a/git-lfs.spec b/git-lfs.spec
index c117ed850ca..94fe27c538b 100644
--- a/git-lfs.spec
+++ b/git-lfs.spec
@@ -1,17 +1,11 @@
-### RPM external git-lfs 3.6.0
-Source: https://github.com/git-lfs/git-lfs/archive/v%{realversion}.tar.gz
-BuildRequires: gmake go
+### RPM external git-lfs 3.7.1
+Source: https://github.com/git-lfs/git-lfs/releases/download/v%{realversion}/git-lfs-linux-%{go_package_arch}-v%{realversion}.tar.gz
 Requires: git
 
 %prep
 %setup -n %{n}-%{realversion}
 
 %build
-make %{makeprocesses} \
-  VERSION=v%{realversion} \
-  GIT_LFS_SHA=%{realversion} \
-  GO=$(which go)
 
 %install
-mkdir -p %{i}/bin
-mv bin/git-lfs %{i}/bin
+PREFIX=%{i} ./install.sh
diff --git a/go-bootstrap.spec b/go-bootstrap.spec
new file mode 100644
index 00000000000..0144c5f6751
--- /dev/null
+++ b/go-bootstrap.spec
@@ -0,0 +1,13 @@
+### RPM external go-bootstrap 1.22.6
+## NOCOMPILER
+
+Provides: /bin/rc
+Source: https://go.dev/dl/go%{realversion}.linux-%{go_package_arch }.tar.gz
+
+%prep
+%setup -n go
+
+%build
+
+%install
+rsync -a ./ %i/
diff --git a/go.spec b/go.spec
index 543f6d65bcd..432a200c7fa 100644
--- a/go.spec
+++ b/go.spec
@@ -1,20 +1,15 @@
-### RPM external go 1.22.5
-## NOCOMPILER
-
-%ifarch x86_64
-%define download_arch amd64
-%elifarch aarch64
-%define download_arch arm64
-%else
-%define download_arch   %{_arch}
-%endif
-Provides: /bin/rc
-Source: https://go.dev/dl/go%{realversion}.linux-%{download_arch}.tar.gz
+### RPM external go 1.25.5
+BuildRequires: go-bootstrap
+AutoReqProv: no
+Source: https://go.dev/dl/go%{realversion}.src.tar.gz
 
 %prep
 %setup -n go
 
 %build
+cd src
+export GOROOT_BOOTSTRAP=${GO_BOOTSTRAP_ROOT}
+./make.bash
 
 %install
 rsync -a ./ %i/
diff --git a/rpm-preamble.file b/rpm-preamble.file
index 0e6cc7f4bc8..d060aed480a 100644
--- a/rpm-preamble.file
+++ b/rpm-preamble.file
@@ -414,3 +414,14 @@ fi
 %{?without_cuda:%{!?without_gdrcopy:%define without_gdrcopy 1}}
 %{?without_cuda:%{!?without_cudnn:%define without_cudnn 1}}
 %{?without_rocm:%{!?without_rocm_rocrand:%define without_rocm_rocrand 1}}
+
+#########################################
+# Helper macros for go based packages architecture
+#########################################
+%ifarch x86_64
+%define go_package_arch amd64
+%elifarch aarch64
+%define go_package_arch arm64
+%else
+%define go_package_arch %{_arch}
+%endif