diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 52229a8..3cda62f 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -1,2 +1,5 @@
 arm_variant_type: # [aarch64]
   - sbsa          # [aarch64]
+conda_glibc_ver:
+  - 2.17          # [not aarch64]
+  - 2.26          # [aarch64]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index fa9ccbe..37bde14 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -22,7 +22,7 @@ source:
 
 build:
   number: 2
-  skip: true  # [osx]
+  skip: true  # [osx or (linux and s390x)]
   missing_dso_whitelist:
   - '*'
 
@@ -30,50 +30,50 @@ requirements:
   build:
     - {{ compiler("c") }}
     - {{ compiler("cxx") }}
-    - {{ cdt('libglvnd') }}  # [linux]
-    - {{ cdt('libglvnd-opengl') }}  # [linux]
-    - sysroot_{{ target_platform }} 2.17  # [linux]
-    - arm-variant * {{ arm_variant_type }}  # [aarch64]
+    - {{ cdt('libglvnd') }}  # [linux and aarch64]
+    - {{ cdt('libglvnd-opengl') }}  # [linux and aarch64]
+    - sysroot_{{ target_platform }} {{ conda_glibc_ver }}.*  # [linux]
+    #- arm-variant * {{ arm_variant_type }}  # [aarch64]
   host:
     - cuda-version {{ cuda_version }}
-    - alsa-lib             # [linux]
-    - dbus                 # [linux]
+    - {{ cdt('alsa-lib') }}             # [linux]
+    - dbus                              # [linux]
     - expat
     - fontconfig
     - freetype
     - krb5
     - libglib
-    - libxcb
-    - libxkbcommon         # [linux]
-    - libxkbfile           # [linux]
-    - libzlib
-    - nspr                 # [linux]
-    - nss                  # [linux]
-    - wayland              # [linux]
-    - xcb-util-cursor      # [linux]
-    - xcb-util-image       # [linux]
-    - xcb-util-keysyms     # [linux]
-    - xcb-util-keysyms     # [linux]
-    - xcb-util-renderutil  # [linux]
-    - xcb-util-wm          # [linux]
-    - xorg-libice          # [linux]
-    - xorg-libsm           # [linux]
-    - xorg-libx11          # [linux]
-    - xorg-libxcomposite   # [linux]
-    - xorg-libxdamage      # [linux]
-    - xorg-libxext         # [linux]
-    - xorg-libxfixes       # [linux]
-    - xorg-libxrandr       # [linux]
-    - xorg-libxrender      # [linux]
-    - xorg-libxtst         # [linux]
+    - libxcb                            # [linux]
+    - libxkbcommon                      # [linux]
+    - {{ cdt('libxkbfile') }}           # [linux]
+    - zlib
+    - nspr                              # [linux]
+    - nss                               # [linux]
+    - {{ cdt('libwayland-client') }}    # [linux and aarch64]
+    #- xcb-util-cursor                  # [linux]
+    - {{ cdt('xcb-util-image') }}       # [linux]
+    - {{ cdt('xcb-util-keysyms') }}     # [linux]
+    #- xcb-util-keysyms                 # [linux]
+    - {{ cdt('xcb-util-renderutil') }}  # [linux]
+    - {{ cdt('xcb-util-wm') }}          # [linux]
+    #- xorg-libice          # [linux]
+    #- xorg-libsm           # [linux]
+    #- xorg-libx11          # [linux]
+    #- xorg-libxcomposite   # [linux]
+    #- xorg-libxdamage      # [linux]
+    #- xorg-libxext         # [linux]
+    #- xorg-libxfixes       # [linux]
+    #- xorg-libxrandr       # [linux]
+    #- xorg-libxrender      # [linux]
+    #- xorg-libxtst         # [linux]
   run:
     - {{ pin_compatible("cuda-version", max_pin="x.x") }}
-    - {{ pin_compatible("xorg-libxcomposite", max_pin="x.x") }}  # [linux]
-    - {{ pin_compatible("xorg-libxdamage", max_pin="x.x") }}     # [linux]
-    - {{ pin_compatible("xorg-libxfixes", max_pin="x.x") }}      # [linux]
-    - {{ pin_compatible("xorg-libxrandr", max_pin="x.x") }}      # [linux]
-    - {{ pin_compatible("xorg-libxtst", max_pin="x.x") }}        # [linux]
-    - {{ pin_compatible("libxkbfile", max_pin="x.x") }}          # [linux]
+    #- {{ pin_compatible("xorg-libxcomposite", max_pin="x.x") }}  # [linux]
+    #- {{ pin_compatible("xorg-libxdamage", max_pin="x.x") }}     # [linux]
+    #- {{ pin_compatible("xorg-libxfixes", max_pin="x.x") }}      # [linux]
+    #- {{ pin_compatible("xorg-libxrandr", max_pin="x.x") }}      # [linux]
+    #- {{ pin_compatible("xorg-libxtst", max_pin="x.x") }}        # [linux]
+    #- {{ pin_compatible("libxkbfile", max_pin="x.x") }}          # [linux]
   run_constrained:
     - arm-variant * {{ arm_variant_type }}  # [aarch64]
 
@@ -87,7 +87,8 @@ test:
     - ncu --version
     # ncu-ui test can be enabled for aarch64 once GLIBC 2.28 is made available
     # https://github.com/conda-forge/conda-forge.github.io/issues/1941
-    - DISPLAY=localhost:1.0 xvfb-run -a bash -c 'ncu-ui --help-all'            # [linux64]
+    # This fails now the GUI supporting dependencies are removed
+    #- DISPLAY=localhost:1.0 xvfb-run -a bash -c 'ncu-ui --help-all'            # [linux64]
 
 about:
   home: https://developer.nvidia.com/nsight-compute