diff --git a/_constraints b/_constraints
index fd0fd96..16f8e04 100644
--- a/_constraints
+++ b/_constraints
@@ -16,9 +16,6 @@
       <cpu>
         <flag>asimdrdm</flag>
       </cpu>
-      <physicalmemory>
-        <size unit="G">6</size>
-      </physicalmemory>
     </hardware>
   </overwrite>
   <overwrite>
diff --git a/nodejs18.changes b/nodejs18.changes
index b26c7fb..b5c09b7 100644
--- a/nodejs18.changes
+++ b/nodejs18.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jan 25 12:01:18 UTC 2023 - Adam Majer <adam.majer@suse.de>
+
+- Again use openssl-3, if available.
+- _constraints: reset aarch64 memory requirements back to original
+  otherwise some unit tests can fail
+- s390.patch: fix unit test on s390 with patched zlib
+
 -------------------------------------------------------------------
 Mon Jan 16 14:57:58 UTC 2023 - Adam Majer <adam.majer@suse.de>
 
diff --git a/nodejs18.spec b/nodejs18.spec
index 1ff04ca..489fa34 100644
--- a/nodejs18.spec
+++ b/nodejs18.spec
@@ -82,7 +82,7 @@ Release:        0
 %define _libexecdir %{_exec_prefix}/lib
 %endif
 
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 120500 || 0%{?fedora_version} >= 35
+%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 120400 || 0%{?fedora_version} >= 35
 %bcond_with    intree_openssl
 %else
 %bcond_without intree_openssl
@@ -171,6 +171,7 @@ Patch133:       rsa-pss-revert.patch
 Patch200:       versioned.patch
 
 Patch305:       qemu_timeouts_arches.patch
+Patch307:       s390.patch
 
 BuildRequires:  pkg-config
 BuildRequires:  fdupes
@@ -264,10 +265,10 @@ BuildRequires:  user(nobody)
 BuildRequires:  group(nobody)
 %endif
 
+# shared openssl
 %if ! 0%{with intree_openssl}
 
-BuildRequires:  libopenssl-1_1-devel
-#BuildRequires:  (pkgconfig(openssl) >= %{openssl_req_ver} and pkgconfig(openssl) < 3.0)
+BuildRequires:  pkgconfig(openssl) >= %{openssl_req_ver}
 
 # require patched openssl library on SLES for nodejs16
 %if 0%{?suse_version} && "%{pkg_version openssl-1_1}" != "~~~"
@@ -278,13 +279,19 @@ Requires:       openssl-has-RSA_get0_pss_params
 %endif
 
 %if 0%{?suse_version}
-#%if 0%{?suse_version} >= 1500
-#iBuildRequires:  openssl >= %{openssl_req_ver}
-#%else
-BuildRequires:  openssl-1_1 >= %{openssl_req_ver}
-#%endif
 
+%if 0%{?suse_version} >= 1500
+BuildRequires:  openssl >= %{openssl_req_ver}
+%else
+BuildRequires:  openssl-1_1 >= %{openssl_req_ver}
+%endif
+
+%if %{pkg_vcmp pkgconfig(openssl) > '3.0' }
+BuildRequires:  libopenssl3-hmac
+%else
 BuildRequires:  libopenssl1_1-hmac
+%endif
+
 # /suse_version
 %endif
 
@@ -293,11 +300,14 @@ BuildRequires:  openssl >= %{openssl_req_ver}
 %endif
 
 %else
+# bundled openssl
 %if %node_version_number <= 12 && 0%{?suse_version} == 1315 && 0%{?sle_version} < 120400
 Provides:       bundled(openssl) = 3.0.7
 %else
 BuildRequires:  bundled_openssl_should_not_be_required
 %endif
+
+# /bundled openssl
 %endif
 
 %if ! 0%{with intree_cares}
@@ -684,6 +694,7 @@ popd
 %patch200 -p1
 
 %patch305 -p1
+%patch307 -p1
 
 %if %{node_version_number} <= 12
 # minimist security update - patch50
diff --git a/s390.patch b/s390.patch
new file mode 100644
index 0000000..985424f
--- /dev/null
+++ b/s390.patch
@@ -0,0 +1,28 @@
+Index: node-v18.13.0/test/parallel/test-whatwg-webstreams-compression.js
+===================================================================
+--- node-v18.13.0.orig/test/parallel/test-whatwg-webstreams-compression.js
++++ node-v18.13.0/test/parallel/test-whatwg-webstreams-compression.js
+@@ -20,11 +20,19 @@ async function test(format) {
+   const reader = gunzip.readable.getReader();
+   const writer = gzip.writable.getWriter();
+ 
++  let compressed_data = [];
++  const reader_function = ({ value, done }) => {
++    if (value)
++      compressed_data.push(value);
++    if (!done)
++      return reader.read().then(reader_function);
++    assert.strictEqual(dec.decode(Buffer.concat(compressed_data)), 'hello');
++  };
++  const reader_promise = reader.read().then(reader_function);
++
+   await Promise.all([
+-    reader.read().then(({ value, done }) => {
+-      assert.strictEqual(dec.decode(value), 'hello');
+-    }),
+-    reader.read().then(({ done }) => assert(done)),
++    reader_promise,
++    reader_promise.then(() => reader.read().then(({ done }) => assert(done))),
+     writer.write('hello'),
+     writer.close(),
+   ]);