diff --git a/.gitattributes b/.gitattributes
index 9b03811..2bf0a41 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,3 +21,5 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+aaa_base-84.87+git20210616.9cf42ff.tar filter=lfs diff=lfs merge=lfs -text
diff --git a/_service b/_service
index 10077ec..aacaf15 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,5 @@
 <services>
-  <service name="obs_scm" mode="manual">
+  <service name="tar_scm" mode="manual">
     <param name="version">84.87</param>
     <param name="versionformat">84.87+git%cd.%h</param>
     <param name="url">https://github.com/openSUSE/aaa_base.git</param>
@@ -7,6 +7,4 @@
     <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="manual"/>
-  <service mode="buildtime" name="tar"/>
-  <service mode="buildtime" name="set_version"/>
 </services>
diff --git a/_servicedata b/_servicedata
index 2bf401d..4132d1f 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,4 @@
 <servicedata>
 <service name="tar_scm">
-    <param name="url">https://github.com/openSUSE/aaa_base.git</param>
-    <param name="changesrevision">9cf42ff92f35f20f51ec3a63941601c1d4fe5dcb</param>
-</service>
-</servicedata>
\ No newline at end of file
+                <param name="url">https://github.com/openSUSE/aaa_base.git</param>
+              <param name="changesrevision">9cf42ff92f35f20f51ec3a63941601c1d4fe5dcb</param></service></servicedata>
\ No newline at end of file
diff --git a/aaa_base-84.87+git20210616.9cf42ff.obscpio b/aaa_base-84.87+git20210616.9cf42ff.obscpio
deleted file mode 100644
index f2862de..0000000
--- a/aaa_base-84.87+git20210616.9cf42ff.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19db4001893ac0f5ae3293add830aaa40448caf88bfeead2e653bcd982bd7f5d
-size 297483
diff --git a/aaa_base-84.87+git20210616.9cf42ff.tar b/aaa_base-84.87+git20210616.9cf42ff.tar
new file mode 100644
index 0000000..043f89b
--- /dev/null
+++ b/aaa_base-84.87+git20210616.9cf42ff.tar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:55a1a5cbd1382e75586ff863da680b47903a9c09ebd6be20060c9ab94d039cd3
+size 358400
diff --git a/aaa_base.changes b/aaa_base.changes
index 949a3c1..492e068 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jun 22 06:52:15 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Switch back to using tar_scm in _service file: with aaa_base
+  being part of the distro bootstrap (ring0) we want to have the
+  build deps as lean as possible. Buildtime services equals to
+  build deps.
+
 -------------------------------------------------------------------
 Wed Jun 16 09:19:09 UTC 2021 - lnussel@suse.de
 
diff --git a/aaa_base.obsinfo b/aaa_base.obsinfo
deleted file mode 100644
index 9152648..0000000
--- a/aaa_base.obsinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-name: aaa_base
-version: 84.87+git20210616.9cf42ff
-mtime: 1623834256
-commit: 9cf42ff92f35f20f51ec3a63941601c1d4fe5dcb
-
diff --git a/aaa_base.spec b/aaa_base.spec
index bd543ef..4c734aa 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -53,7 +53,7 @@ Summary:        openSUSE Base Package
 License:        GPL-2.0-or-later
 Group:          System/Fhs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# run osc service dr to recreate
+# run osc service mr to recreate
 Source:         aaa_base-%{version}.tar
 #
 # Read README.packaging.txt before making any changes to this