diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8c907f0..ba3dee53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,9 +145,30 @@ build:x86:rpm:
     - mv *.rpm ..
   artifacts:
     paths:
-      - "*.rpm"
+      - "jfjoch-driver*.rpm"
+      - "jfjoch-writer*.rpm"
+      - "jfjoch-1*.rpm"
     expire_in: 1 week
 
+build:x86:rpm_nocuda:
+  stage: build
+  tags:
+    - x86
+  needs: []
+  script:
+    - mkdir build
+    - cd build
+    - source /opt/rh/gcc-toolset-12/enable
+    - cmake -DCMAKE_BUILD_TYPE=Release -DJFJOCH_INSTALL_DRIVER_SOURCE=ON -DJFJOCH_VIEWER_BUILD=ON -DJFJOCH_USE_CUDA=OFF ..
+    - make frontend
+    - make -j48 package
+    - mv *.rpm ..
+  artifacts:
+    paths:
+      - "jfjoch-viewer*.rpm"
+    expire_in: 1 week
+
+
 build:x86:sls9:rpm:
   stage: build
   tags:
@@ -160,6 +181,10 @@ build:x86:sls9:rpm:
     - cmake -DCMAKE_BUILD_TYPE=Release -DJFJOCH_INSTALL_DRIVER_SOURCE=OFF -DJFJOCH_VIEWER_BUILD=OFF -DSLS9=ON ..
     - make frontend
     - make -j48 package
+  artifacts:
+    paths:
+      - "jfjoch-slsdet9*.rpm"
+    expire_in: 1 week
 
 test:x86:gcc:
   stage: test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec785f3f..59b2578a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -213,7 +213,12 @@ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 # Set Package Name
 # Initialize CPACK_COMPONENTS_ALL with common components
 set(CPACK_COMPONENTS_ALL jfjoch writer)
-set(CPACK_PACKAGE_NAME "jfjoch")
+
+IF (SLS9)
+    SET(CPACK_PACKAGE_NAME "jfjoch-slsdet9")
+ELSE()
+    SET(CPACK_PACKAGE_NAME "jfjoch")
+ENDIF()
 
 # Add optional components
 if (JFJOCH_INSTALL_DRIVER_SOURCE)