diff --git a/baremetal-operator/_service b/baremetal-operator/_service
index 2628004..c45ecc3 100644
--- a/baremetal-operator/_service
+++ b/baremetal-operator/_service
@@ -12,10 +12,8 @@
     <param name="without-version">yes</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
+  <service mode="buildtime" name="tar">
+    <param name="obsinfo">baremetal-operator.obsinfo</param>
   </service>
    <service name="go_modules">
   </service>
@@ -23,7 +21,7 @@
     <param name="file">baremetal-operator.spec</param>
     <param name="var">SOURCE_COMMIT</param>
     <param name="eval">
-      SOURCE_COMMIT=$(grep commit *.obsinfo | cut -d" " -f2)
+      SOURCE_COMMIT=$(grep commit baremetal-operator.obsinfo | cut -d" " -f2)
     </param>
     <param name="verbose">1</param>
   </service>
diff --git a/baremetal-operator/baremetal-operator.spec b/baremetal-operator/baremetal-operator.spec
index 66c6108..94d7ec5 100644
--- a/baremetal-operator/baremetal-operator.spec
+++ b/baremetal-operator/baremetal-operator.spec
@@ -22,7 +22,7 @@ Release:        0.8.0
 Summary:        Implements a Kubernetes API for managing bare metal hosts
 License:        Apache-2.0
 URL:            https://github.com/metal3-io/baremetal-operator
-Source:         baremetal-operator-%{version}.tar.gz
+Source:         baremetal-operator-%{version}.tar
 Source1:        vendor.tar.gz
 BuildRequires:  golang(API) = 1.22
 ExcludeArch:    s390
diff --git a/cosign/_service b/cosign/_service
index 94a6556..1233d4a 100644
--- a/cosign/_service
+++ b/cosign/_service
@@ -8,10 +8,8 @@
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
+  <service mode="buildtime" name="tar">
+    <param name="obsinfo">cosign.obsinfo</param>
   </service>
   <service mode="buildtime" name="set_version" />
   <service name="go_modules">
diff --git a/cosign/cosign.spec b/cosign/cosign.spec
index 753cb1b..850a003 100644
--- a/cosign/cosign.spec
+++ b/cosign/cosign.spec
@@ -24,7 +24,7 @@ Release:        0
 Summary:        Container Signing, Verification and Storage in an OCI registry
 License:        Apache-2.0
 URL:            https://github.com/rancher-government-carbide/cosign
-Source:         cosign-%{version}.tar.gz
+Source:         cosign-%{version}.tar
 Source1:        vendor.tar.gz         
 BuildRequires:  golang-packaging
 
diff --git a/edge-image-builder/_service b/edge-image-builder/_service
index 534bd18..63b3ac7 100644
--- a/edge-image-builder/_service
+++ b/edge-image-builder/_service
@@ -9,10 +9,8 @@
     <param name="versionrewrite-replacement">\1.\2.\3</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
+  <service mode="buildtime" name="tar">
+    <param name="obsinfo">edge-image-builder.obsinfo</param>
   </service>
   <service mode="buildtime" name="set_version" />
   <service name="go_modules">
diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec
index c1e10bd..e1c1f77 100644
--- a/edge-image-builder/edge-image-builder.spec
+++ b/edge-image-builder/edge-image-builder.spec
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Edge Image Builder
 License:        Apache-2.0
 URL:            https://github.com/suse-edge/edge-image-builder
-Source:         edge-image-builder-%{version}.tar.gz
+Source:         edge-image-builder-%{version}.tar
 Source1:        vendor.tar.gz
 BuildRequires:  golang(API) go1.22
 BuildRequires:  golang-packaging
diff --git a/endpoint-copier-operator/_service b/endpoint-copier-operator/_service
index 81fb0fb..a6877c9 100644
--- a/endpoint-copier-operator/_service
+++ b/endpoint-copier-operator/_service
@@ -12,10 +12,8 @@
     <param name="without-version">yes</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
+  <service mode="buildtime" name="tar">
+    <param name="obsinfo">endpoint-copier-operator.obsinfo</param>
   </service>
   <service name="go_modules">
   </service>
diff --git a/endpoint-copier-operator/endpoint-copier-operator.spec b/endpoint-copier-operator/endpoint-copier-operator.spec
index 0466fc1..b1f390e 100644
--- a/endpoint-copier-operator/endpoint-copier-operator.spec
+++ b/endpoint-copier-operator/endpoint-copier-operator.spec
@@ -22,7 +22,7 @@ Release:        0.2.0
 Summary:        Implements a Kubernetes API for copying endpoint resources
 License:        Apache-2.0
 URL:            https://github.com/suse-edge/endpoint-copier-operator
-Source:         endpoint-copier-operator-%{version}.tar.gz
+Source:         endpoint-copier-operator-%{version}.tar
 Source1:        vendor.tar.gz
 BuildRequires:  golang(API) = 1.20
 ExcludeArch:    s390
diff --git a/frr-k8s/_service b/frr-k8s/_service
index 10c03d5..f83862b 100644
--- a/frr-k8s/_service
+++ b/frr-k8s/_service
@@ -12,10 +12,8 @@
     <param name="without-version">yes</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
+  <service mode="buildtime" name="tar">
+    <param name="obsinfo">frr-k8s.obsinfo</param>
   </service>
   <service name="go_modules">
   </service>
diff --git a/frr-k8s/frr-k8s.spec b/frr-k8s/frr-k8s.spec
index 9342812..3d97a10 100644
--- a/frr-k8s/frr-k8s.spec
+++ b/frr-k8s/frr-k8s.spec
@@ -22,7 +22,7 @@ Release:        0.0.14
 Summary:        A kubernetes based daemonset that exposes a subset of the FRR API in a kubernetes compliant manner.
 License:        Apache-2.0
 URL:            https://github.com/metallb/frr-k8s
-Source:         frr-k8s-%{version}.tar.gz
+Source:         frr-k8s-%{version}.tar
 Source1:        vendor.tar.gz
 BuildRequires:  golang(API) = 1.22
 ExcludeArch:    s390
diff --git a/hauler/_service b/hauler/_service
index 54563fb..a7d11ad 100644
--- a/hauler/_service
+++ b/hauler/_service
@@ -8,10 +8,8 @@
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
+  <service mode="buildtime" name="tar">
+    <param name="obsinfo">hauler.obsinfo</param>
   </service>
   <service mode="buildtime" name="set_version" />
   <service name="go_modules">
diff --git a/hauler/hauler.spec b/hauler/hauler.spec
index cbee7c0..79b5052 100644
--- a/hauler/hauler.spec
+++ b/hauler/hauler.spec
@@ -23,7 +23,7 @@ Release:        0
 Summary:        Airgap Swiss Army Knife
 License:        Apache-2.0
 URL:            https://github.com/hauler-dev/hauler
-Source:         hauler-%{version}.tar.gz
+Source:         hauler-%{version}.tar
 Source1:        vendor.tar.gz
 BuildRequires:  golang-packaging
 BuildRequires:  cosign
diff --git a/kube-rbac-proxy/_service b/kube-rbac-proxy/_service
index 99268e7..40083f2 100644
--- a/kube-rbac-proxy/_service
+++ b/kube-rbac-proxy/_service
@@ -12,10 +12,8 @@
     <param name="without-version">yes</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
+  <service mode="buildtime" name="tar" >
+    <param name="obsinfo">kube-rbac-proxy.obsinfo</param>
   </service>
   <service name="go_modules">
   </service>
diff --git a/kube-rbac-proxy/kube-rbac-proxy.spec b/kube-rbac-proxy/kube-rbac-proxy.spec
index 9d8075a..ead43b6 100644
--- a/kube-rbac-proxy/kube-rbac-proxy.spec
+++ b/kube-rbac-proxy/kube-rbac-proxy.spec
@@ -22,7 +22,7 @@ Release:        0.18.1
 Summary:        The kube-rbac-proxy is a small HTTP proxy for a single upstream
 License:        Apache-2.0
 URL:            https://github.com/brancz/kube-rbac-proxy
-Source:         kube-rbac-proxy-%{version}.tar.gz
+Source:         kube-rbac-proxy-%{version}.tar
 Source1:        vendor.tar.gz
 BuildRequires:  golang(API) = 1.23
 ExcludeArch:    s390
diff --git a/metallb/_service b/metallb/_service
index 5066257..e709ca2 100644
--- a/metallb/_service
+++ b/metallb/_service
@@ -12,10 +12,8 @@
     <param name="without-version">yes</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
+  <service mode="buildtime" name="tar">
+    <param name="obsinfo">metallb.obsinfo</param>
   </service>
   <service name="go_modules">
   </service>
diff --git a/metallb/metallb.spec b/metallb/metallb.spec
index f59d4db..17316a4 100644
--- a/metallb/metallb.spec
+++ b/metallb/metallb.spec
@@ -22,7 +22,7 @@ Release:        0.14.8
 Summary:        Load Balancer for bare metal Kubernetes clusters
 License:        Apache-2.0
 URL:            https://github.com/metallb/metallb
-Source:         %{name}-%{version}.tar.gz
+Source:         %{name}-%{version}.tar
 Source1:        vendor.tar.gz
 BuildRequires:  golang(API) = 1.22
 ExcludeArch:    s390
diff --git a/nm-configurator/_service b/nm-configurator/_service
index a83f874..5a481e9 100644
--- a/nm-configurator/_service
+++ b/nm-configurator/_service
@@ -9,7 +9,9 @@
     <param name="versionrewrite-replacement">\1</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service mode="buildtime" name="tar" />
+  <service mode="buildtime" name="tar">
+    <param name="obsinfo">nm-configurator.obsinfo</param>
+  </service>
   <service mode="buildtime" name="set_version"/>
   <service mode="manual" name="cargo_vendor">
      <param name="src">nm-configurator</param>
diff --git a/upgrade-controller/_service b/upgrade-controller/_service
index 251bb05..3610179 100644
--- a/upgrade-controller/_service
+++ b/upgrade-controller/_service
@@ -9,10 +9,8 @@
     <param name="versionrewrite-replacement">\1.\2.\3</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
+  <service mode="buildtime" name="tar">
+    <param name="obsinfo">upgrade-controller.obsinfo</param>
   </service>
   <service name="go_modules">
      <param name="compression">gz</param>
diff --git a/upgrade-controller/upgrade-controller.spec b/upgrade-controller/upgrade-controller.spec
index 2d7d586..d7cf993 100644
--- a/upgrade-controller/upgrade-controller.spec
+++ b/upgrade-controller/upgrade-controller.spec
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Upgrade Controller
 License:        Apache-2.0 
 URL:            https://github.com/suse-edge/upgrade-controller
-Source:         upgrade-controller-%{version}.tar.gz
+Source:         upgrade-controller-%{version}.tar
 Source1:        vendor.tar.gz
 BuildRequires:  golang(API) go1.22
 BuildRequires:  golang-packaging