diff --git a/_service b/_service
index 1199227..62f5ee0 100644
--- a/_service
+++ b/_service
@@ -1,23 +1,12 @@
 <services>
-  <!-- The copy of this file in the OBS package needs to be manually updated
-       from the one in git repo.
-       Parameter definitions:
-       https://github.com/openSUSE/obs-service-tar_scm/blob/master/tar_scm.service.in
-  -->
   <service name="tar_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://github.com/SUSE/connect-ng.git</param>
-    <param name="revision">1.9_bugfix_release</param>
-    <param name="version">1.9.0</param>
-
-    <!-- <param name="match-tag">v*</param>
-    <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
-    <param name="versionrewrite-replacement">\1</param>
-    <param name="versionformat">@PARENT_TAG@</param> -->
+    <param name="revision">main</param>
+    <param name="version">1.10.0</param>
     <param name="filename">suseconnect-ng</param>
-    <param name="changesgenerate">enable</param>
     <param name="package-meta">no</param>
-    <param name="exclude">vendor</param>
+    <param name="changesgenerate">disable</param>
   </service>
   <service name="recompress" mode="manual">
     <param name="file">*.tar</param>
@@ -25,15 +14,11 @@
   </service>
   <service name="extract_file" mode="manual">
     <param name="archive">suseconnect-ng*.tar.xz</param>
-    <param name="files">suseconnect-ng-*/suseconnect-ng.spec</param>
-    <param name="files">suseconnect-ng-*/suseconnect-ng.changes</param>
-    <param name="files">suseconnect-ng-*/suseconnect-ng-rpmlintrc</param>
+    <param name="files">suseconnect-ng-*/build/packaging/suseconnect-ng.spec</param>
+    <param name="files">suseconnect-ng-*/build/packaging/suseconnect-ng.changes</param>
+    <param name="files">suseconnect-ng-*/build/packaging/suseconnect-ng-rpmlintrc</param>
   </service>
-  <service name="set_version" mode="manual">
-    <param name="file">suseconnect-ng.spec</param>
+  <service name="go_modules" mode="manual">
+    <param name="compression">xz</param>
   </service>
-<!--
-  <service name="go_modules" mode="disabled">
-  </service>
--->
 </services>
diff --git a/suseconnect-ng-1.10.0.tar.xz b/suseconnect-ng-1.10.0.tar.xz
new file mode 100644
index 0000000..a5418c4
--- /dev/null
+++ b/suseconnect-ng-1.10.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2507a763fc1532cb7b594c14603cbfd0f75b04b49f26a62346e0248b952f50e2
+size 104392
diff --git a/suseconnect-ng-1.9.0.tar.xz b/suseconnect-ng-1.9.0.tar.xz
deleted file mode 100644
index 4f0ddc2..0000000
--- a/suseconnect-ng-1.9.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed186a5c5a7d5958a4afc9ab28f5156b8fc034a7daf5098304b3b72389b9beca
-size 98152
diff --git a/suseconnect-ng.changes b/suseconnect-ng.changes
index 2b10d48..796ac7f 100644
--- a/suseconnect-ng.changes
+++ b/suseconnect-ng.changes
@@ -1,9 +1,24 @@
+-------------------------------------------------------------------
+Thu May 23 15:00:00 UTC 2024 - Felix Schnizlein <fschnizlein@suse.com>
+
+- Update version to 1.10.0
+  * Build zypper-migration and zypper-packages-search as standalone
+    binaries rather then one single binary
+  * Add --gpg-auto-import-keys flag before action in zypper command (bsc#1219004)
+  * Include /etc/products.d in directories whose content are backed
+    up and restored if a zypper-migration rollback happens. (bsc#1219004)
+  * Add the ability to upload the system uptime logs, produced by the
+    suse-uptime-tracker daemon, to SCC/RMT as part of keepalive report.
+    (jsc#PED-7982) (jsc#PED-8018)
+  * Add support for third party packages in SUSEConnect
+  * Refactor existing system information collection implementation
+
 -------------------------------------------------------------------
 Tue May  7 14:12:47 UTC 2024 - Thomas Schmidt <tschmidt@suse.com>
 
 - Update to version 1.9.0
   * Fix certificate import for Yast when using a registration proxy with
-    self-signed SSL certificate (bsc#1223107) 
+    self-signed SSL certificate (bsc#1223107)
 
 -------------------------------------------------------------------
 Wed Mar 13 12:37:29 UTC 2024 - José Gómez <1josegomezr@gmail.com>
diff --git a/suseconnect-ng.spec b/suseconnect-ng.spec
index 2a9912e..1c9350c 100644
--- a/suseconnect-ng.spec
+++ b/suseconnect-ng.spec
@@ -19,7 +19,7 @@
 %global project github.com/SUSE/connect-ng
 
 Name:           suseconnect-ng
-Version:        1.9.0
+Version:        1.10.0
 Release:        0
 URL:            https://github.com/SUSE/connect-ng
 License:        LGPL-2.1-or-later
@@ -27,9 +27,10 @@ Summary:        Utility to register a system with the SUSE Customer Center
 Group:          System/Management
 Source:         suseconnect-ng-%{version}.tar.xz
 Source1:        %{name}-rpmlintrc
+Source2:        vendor.tar.xz
 
 # Build against latest golang in Tumbleweed and
-# go1.18-openssl on all other distributions
+# go1.21-openssl on all other distributions
 %if 0%{?suse_version} > 1600
 BuildRequires:  golang(API)
 %else
@@ -43,6 +44,7 @@ ExcludeArch:    %ix86 s390 ppc64
 
 Obsoletes:      SUSEConnect < 1.1.0
 Provides:       SUSEConnect = %version
+Provides:       suseconnect = %version
 Obsoletes:      zypper-migration-plugin < 0.99
 Provides:       zypper-migration-plugin = 0.99
 Obsoletes:      zypper-search-packages-plugin < 0.99
@@ -55,20 +57,18 @@ Requires:       ca-certificates
 %endif
 
 Requires:       coreutils
+Requires:       util-linux
+Requires:       zypper
+Recommends:     systemd
+
+%ifarch s390x
+Requires:       s390-tools
+%endif
+
 # ExclusiveArch from this package
 %ifarch ia64 x86_64 %arm aarch64
 Requires:       dmidecode
 %endif
-# ExclusiveArch from this package
-%ifarch s390x
-Requires:       s390-tools
-%endif
-Requires:       zypper
-# lscpu is only used on those
-%ifarch aarch64
-Requires:       util-linux
-%endif
-Recommends:     systemd
 
 %description
 This package provides a command line tool for connecting a
@@ -81,7 +81,7 @@ replaced SUSEConnect.
 Summary:        C interface to suseconnect-ng
 Group:          System/Management
 # the CLI is not used by libsuseconnect but it has the same dependencies and it's easier to keep one list above
-Requires:       suseconnect-ng
+Requires:       suseconnect-ng = %version
 
 %description -n libsuseconnect
 This package contains library which provides C interface to selected
@@ -90,7 +90,7 @@ suseconnect-ng functions.
 %package -n suseconnect-ruby-bindings
 Summary:        Ruby bindings for libsuseconnect library
 Group:          System/Management
-Requires:       libsuseconnect
+Requires:       libsuseconnect = %version
 # Adding the rubygem provides, to work as a drop-in replacement for Ruby SUSEConnect on SLE15<SP4
 %if (0%{?sle_version} > 0 && 0%{?sle_version} < 150400)
 Provides:       rubygem(ruby:2.5.0:suse-connect)
@@ -100,41 +100,46 @@ Provides:       rubygem(ruby:2.5.0:suse-connect)
 This package provides bindings needed to use libsuseconnect from Ruby scripts.
 
 %prep
-%autosetup -p 1 -n %{name}-%{version}
+%autosetup -p1 -a2 -n%{name}-%{version}
 
 %build
 # the binary
 echo %{version} > internal/connect/version.txt
-go build -v -ldflags "-s -w" -buildmode=pie -o bin/suseconnect %{project}/suseconnect
+go build -v -ldflags "-s -w" -mod=vendor -buildmode=pie -o bin/suseconnect %{project}/cmd/suseconnect
+go build -v -ldflags "-s -w" -mod=vendor -buildmode=pie -o bin/zypper-migration %{project}/cmd/zypper-migration
+go build -v -ldflags "-s -w" -mod=vendor -buildmode=pie -o bin/zypper-search-packages %{project}/cmd/zypper-search-packages
 
 # the library
 mkdir -p %_builddir/go/lib
-go build -v -ldflags "-s -w" -buildmode=c-shared -o lib/libsuseconnect.so %{project}/libsuseconnect
+go build -v -ldflags "-s -w" -mod=vendor -buildmode=c-shared -o lib/libsuseconnect.so %{project}/third_party/libsuseconnect
 
 %install
 # Install binary + symlinks
 install -D -m 0755 bin/suseconnect %{buildroot}/%{_bindir}/suseconnect
-install -d -m 0755 %{buildroot}/%{_sbindir} %{buildroot}/usr/lib/zypper/commands
 ln -s %{_bindir}/suseconnect %{buildroot}/%{_bindir}/SUSEConnect
+
+install -d -m 0755 %{buildroot}/%{_sbindir}
 ln -s %{_bindir}/suseconnect %{buildroot}/%{_sbindir}/SUSEConnect
-ln -s %{_bindir}/suseconnect %{buildroot}/usr/lib/zypper/commands/zypper-migration
-ln -s %{_bindir}/suseconnect %{buildroot}/usr/lib/zypper/commands/zypper-search-packages
+
+install -d -m 0755 %{buildroot}/usr/lib/zypper/commands
+install -D -m 0755 bin/zypper-search-packages %{buildroot}/usr/lib/zypper/commands/zypper-search-packages
+install -D -m 0755 bin/zypper-migration %{buildroot}/usr/lib/zypper/commands/zypper-migration
 
 # Install library + ruby bindings
 install -D -m 0755 lib/libsuseconnect.so %{buildroot}/%{_libdir}/libsuseconnect.so
 install -d -m 0755 %{buildroot}/%{_libdir}/ruby/vendor_ruby/%{rb_ver}
-cp -r yast/lib/* %{buildroot}/%{_libdir}/ruby/vendor_ruby/%{rb_ver}
+cp -r third_party/yast/lib/* %{buildroot}/%{_libdir}/ruby/vendor_ruby/%{rb_ver}
 
 # Install metadata
-install -D -m 644 man/SUSEConnect.5 %{buildroot}/%{_mandir}/man5/SUSEConnect.5
-install -D -m 644 man/SUSEConnect.8 %{buildroot}/%{_mandir}/man8/SUSEConnect.8
-install -D -m 644 man/zypper-migration.8 %{buildroot}/%{_mandir}/man8/zypper-migration.8
-install -D -m 644 man/zypper-search-packages.8 %{buildroot}/%{_mandir}/man8/zypper-search-packages.8
+install -D -m 644 docs/SUSEConnect.5 %{buildroot}/%{_mandir}/man5/SUSEConnect.5
+install -D -m 644 docs/SUSEConnect.8 %{buildroot}/%{_mandir}/man8/SUSEConnect.8
+install -D -m 644 docs/zypper-migration.8 %{buildroot}/%{_mandir}/man8/zypper-migration.8
+install -D -m 644 docs/zypper-search-packages.8 %{buildroot}/%{_mandir}/man8/zypper-search-packages.8
 install -D -m 644 SUSEConnect.example %{buildroot}%{_sysconfdir}/SUSEConnect.example
 
 # Install the SUSEConnect --keepalive timer and service.
-install -D -m 644 suseconnect-keepalive.timer %{buildroot}/%{_unitdir}/suseconnect-keepalive.timer
-install -D -m 644 suseconnect-keepalive.service %{buildroot}/%{_unitdir}/suseconnect-keepalive.service
+install -D -m 644 build/packaging/suseconnect-keepalive.timer %{buildroot}/%{_unitdir}/suseconnect-keepalive.timer
+install -D -m 644 build/packaging/suseconnect-keepalive.service %{buildroot}/%{_unitdir}/suseconnect-keepalive.service
 ln -sf service %{buildroot}/%{_sbindir}/rcsuseconnect-keepalive
 
 # we currently do not ship the source for any go module
@@ -230,7 +235,7 @@ fi
 %{_libdir}/libsuseconnect.so
 
 %files -n suseconnect-ruby-bindings
-%doc yast/README.md
+%doc third_party/yast/README.md
 %{_libdir}/ruby/vendor_ruby/%rb_ver/suse
 
 %changelog
diff --git a/vendor.tar.xz b/vendor.tar.xz
new file mode 100644
index 0000000..3ac6186
--- /dev/null
+++ b/vendor.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09dc37063bf50b41dba1bb2c041edd97886869444f1d9ff809d7c539177f41e8
+size 125712