diff --git a/.gitattributes b/.gitattributes
index 9eb3bdd..fecc750 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,5 +21,3 @@
 *.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+git20220321.5a5cb79.tar filter=lfs diff=lfs merge=lfs -text
diff --git a/_service b/_service
index de80fc6..5de3342 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,5 @@
 <services>
-  <service name="tar_scm" mode="manual">
+  <service name="tar_scm" mode="disabled">
     <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>
@@ -9,5 +9,9 @@
     <param name="extract">aaa_base-rpmlintrc</param>
     <param name="extract">README.packaging.txt</param>
   </service>
-  <service name="set_version" mode="manual"/>
+   <service name="recompress" mode="disabled">
+     <param name="compression">zstd</param>
+     <param name="file">*.tar</param>
+   </service>
+  <service name="set_version" mode="disabled"/>
 </services>
diff --git a/aaa_base-84.87+git20220321.5a5cb79.tar b/aaa_base-84.87+git20220321.5a5cb79.tar
deleted file mode 100644
index d46e7db..0000000
--- a/aaa_base-84.87+git20220321.5a5cb79.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37bcbdbfceb9e784f47bbde40d8382f28822b961224c8ab4dde99a1aec257e5e
-size 378880
diff --git a/aaa_base-84.87+git20220321.5a5cb79.tar.zst b/aaa_base-84.87+git20220321.5a5cb79.tar.zst
new file mode 100644
index 0000000..0350ab9
--- /dev/null
+++ b/aaa_base-84.87+git20220321.5a5cb79.tar.zst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a59607bfb6c0e980521e2521e878dec08363f5d8033c9744e6c94849d232491c
+size 73347
diff --git a/aaa_base.changes b/aaa_base.changes
index 4bdc3bf..be732f6 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 21 11:40:10 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- remove build-in-place as this breaks factory submission
+- light modernization for spec file ($RPM_BUILD_ROOT -> %%{buildroot} )
+
 -------------------------------------------------------------------
 Mon Mar 21 10:08:15 UTC 2022 - lnussel@suse.de
 
diff --git a/aaa_base.spec b/aaa_base.spec
index c09948f..dcbdc27 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -14,7 +14,6 @@
 
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
-# icecream 0
 
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
@@ -22,13 +21,13 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-%if 0%{?_build_in_place}
-%define git_version %(git log '-n1' '--date=format:%Y%m%d' '--no-show-signature' "--pretty=format:+git%cd.%h")
-BuildRequires:  git-core
-%endif
+#%if 0%{?_build_in_place}
+#%define git_version %(git log '-n1' '--date=format:%Y%m%d' '--no-show-signature' "--pretty=format:+git%cd.%h")
+#BuildRequires:  git-core
+#%endif
 
 Name:           aaa_base
-Version:        84.87+git20220321.5a5cb79%{?git_version}
+Version:        84.87+git20220321.5a5cb79
 Release:        0
 URL:            https://github.com/openSUSE/aaa_base
 # do not require systemd - aaa_base is in the build environment and we don't
@@ -57,9 +56,9 @@ Requires(post): fillup /usr/bin/chmod /usr/bin/chown
 Summary:        openSUSE Base Package
 License:        GPL-2.0-or-later
 Group:          System/Fhs
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  zstd
 # run osc service mr to recreate
-Source:         aaa_base-%{version}.tar
+Source:         aaa_base-%{version}.tar.zst
 #
 # Read README.packaging.txt before making any changes to this
 # package
@@ -112,7 +111,7 @@ make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags}
 
 %install
 #
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 #
 mkdir -p %{buildroot}/etc/sysctl.d
 case "$RPM_ARCH" in
@@ -121,11 +120,11 @@ case "$RPM_ARCH" in
 esac
 #
 # make sure it does not creep in again
-test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1
+test -d %{buildroot}/root/.gnupg && exit 1
 # TODO: get rid of that at some point in the future
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
+mkdir -p %{buildroot}/etc/init.d
 for i in boot.local after.local ; do
-  install -m 755 /dev/null $RPM_BUILD_ROOT/etc/init.d/$i
+  install -m 755 /dev/null %{buildroot}/etc/init.d/$i
 done
 #
 install -d -m 755 %buildroot%{_libexecdir}/initscripts/legacy-actions
@@ -169,7 +168,6 @@ mkdir -p %{buildroot}%{_fillupdir}
 %service_del_postun backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer
 
 %files
-%defattr(-,root,root)
 %license COPYING
 %config(noreplace) /etc/sysctl.conf
 %config /etc/bash.bashrc
@@ -226,7 +224,6 @@ mkdir -p %{buildroot}%{_fillupdir}
 %{_fillupdir}/sysconfig.windowmanager
 
 %files extras
-%defattr(-,root,root)
 %config(noreplace) /etc/DIR_COLORS
 /etc/skel/.emacs
 /etc/skel/.inputrc
@@ -241,12 +238,10 @@ mkdir -p %{buildroot}%{_fillupdir}
 %{_fillupdir}/sysconfig.backup
 
 %files malloccheck
-%defattr(-,root,root)
 /usr/etc/profile.d/malloc-debug.sh
 /usr/etc/profile.d/malloc-debug.csh
 
 %files wsl
-%defattr(-,root,root)
 /usr/etc/profile.d/wsl.csh
 /usr/etc/profile.d/wsl.sh