diff --git a/_servicedata b/_servicedata
index 383f032..f29fd4f 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/SUSE/connect-ng.git</param>
-              <param name="changesrevision">53382700b33bbc8bf70c7bb88b7a7936e96ed2a0</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">21ba08ee39e18e237d920dba3f66db4faebdf47f</param></service></servicedata>
\ No newline at end of file
diff --git a/suseconnect-ng.changes b/suseconnect-ng.changes
index 1c7b49b..f229ee6 100644
--- a/suseconnect-ng.changes
+++ b/suseconnect-ng.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Feb 14 18:28 UTC 2024 - Felix Schnizlein <fschnizlein@suse.com>
 
-- Update to version 1.7.0~git0.5338270
+- Update to version 1.7.0~git2.21ba08e
   * Allow SUSEConnect on read write transactional systems (bsc#1219425)
 
 -------------------------------------------------------------------
diff --git a/suseconnect-ng.spec b/suseconnect-ng.spec
index 5a58eeb..6fc7fcd 100644
--- a/suseconnect-ng.spec
+++ b/suseconnect-ng.spec
@@ -24,7 +24,7 @@
 
 Name:           suseconnect-ng
 # the version will get set by the 'set_version' service
-Version:        1.7.0~git0.5338270
+Version:        1.7.0~git2.21ba08e
 Release:        0
 URL:            https://github.com/SUSE/connect-ng
 License:        LGPL-2.1-or-later
@@ -32,7 +32,15 @@ Summary:        Utility to register a system with the SUSE Customer Center
 Group:          System/Management
 Source:         connect-ng-%{version}.tar.xz
 Source1:        %name-rpmlintrc
+
+# Build against latest golang in Tumbleweed and
+# go1.18-openssl on all other distributions
+%if 0%{?suse_version} >= 1600
+BuildRequires:  golang(API)
+%else
 BuildRequires:  go1.18-openssl
+%endif
+
 BuildRequires:  golang-packaging
 BuildRequires:  ruby-devel
 BuildRequires:  zypper