diff --git a/nvidia-open-driver-G06-signed.changes b/nvidia-open-driver-G06-signed.changes
index efc7b3c..81b2495 100644
--- a/nvidia-open-driver-G06-signed.changes
+++ b/nvidia-open-driver-G06-signed.changes
@@ -1,7 +1,15 @@
+-------------------------------------------------------------------
+Thu Jul  4 16:29:09 UTC 2024 - Egbert Eich <eich@suse.com>
+
+- To avoid issues with missing dependencies when no CUDA repo
+  is present make the dependecy to nvidia-compute-G06 conditional.
+- CUDA is not available for Tumbleweed, exclude the build of the
+  cuda flavor.
+
 -------------------------------------------------------------------
 Thu Jul  4 14:15:41 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
 
-- preamble: let the -cuda flavor KMP require the -cuda flavor 
+- preamble: let the -cuda flavor KMP require the -cuda flavor
   firmware
 
 -------------------------------------------------------------------
diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec
index cf0f924..887d658 100644
--- a/nvidia-open-driver-G06-signed.spec
+++ b/nvidia-open-driver-G06-signed.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package nvidia-open-driver-G06-signed
+# spec file
 #
 # Copyright (c) 2024 SUSE LLC
 #
@@ -18,6 +18,9 @@
 
 %global flavor @BUILD_FLAVOR@%{?nil}
 %if "%{flavor}" == "cuda"
+ %if 0%{?suse_version} > 1600
+ExclusiveArch:  do_not_build
+ %endif
 %{bcond_without cuda}
 %endif
 
@@ -99,9 +102,11 @@ ExclusiveArch:  x86_64 aarch64
       done)}
 
 %package -n nv-prefer-signed-open-driver
+%define version_major %(i=%{version}; echo ${i%%.*})
 Summary:        Prefer the signed open driver when installing CUDA
-Requires:       nvidia-compute-G06 = %version
 Requires:       nvidia-open-driver-G06-signed-cuda-kmp = %version
+# This avoids the package being uninstallable when the CUDA repo is unavaliable preventing problems in staging
+Requires:       ( nvidia-compute-G06 = %version if ( cuda-drivers or cuda-drivers-%version_major ) )
 
 %description -n nv-prefer-signed-open-driver
 By installing this package, the signed NVIDIA open driver built by SUSE will be preferred during installation