diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f6a7911..95f167d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -329,7 +329,7 @@ release:
       --assets-link "{\"name\":\"jfjoch_frontend.tar.gz\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch_frontend.tar.gz\"}"
       --assets-link "{\"name\":\"jfjoch_fpga_pcie_8x10g.mcs\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch_fpga_pcie_8x10g.mcs\"}"
       --assets-link "{\"name\":\"jfjoch_fpga_pcie_100g.mcs\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch_fpga_pcie_100g.mcs\"}"
-      --assets-link "{\"name\":\"jfjoch.${PACKAGE_VERSION}-1.el8.x86_64.rpm\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch.${PACKAGE_VERSION}-1.el8.x86_64.rpm\"}"
-      --assets-link "{\"name\":\"jfjoch-writer.${PACKAGE_VERSION}-1.el8.x86_64.rpm\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch-writer.${PACKAGE_VERSION}-1.el8.x86_64.rpm\"}"
+      --assets-link "{\"name\":\"jfjoch-${PACKAGE_VERSION}-1.el8.x86_64.rpm\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch-${PACKAGE_VERSION}-1.el8.x86_64.rpm\"}"
+      --assets-link "{\"name\":\"jfjoch-writer-${PACKAGE_VERSION}-1.el8.x86_64.rpm\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch-writer-${PACKAGE_VERSION}-1.el8.x86_64.rpm\"}"
       --assets-link "{\"name\":\"jfjoch.el8.x86_64.rpm\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch.el8.x86_64.rpm\"}"
       --assets-link "{\"name\":\"jfjoch-writer.el8.x86_64.rpm\",\"url\":\"${PACKAGE_REGISTRY_URL}/jfjoch-writer.el8.x86_64.rpm\"}"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8f5269f..da4327e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,10 +131,10 @@ ADD_CUSTOM_COMMAND(OUTPUT frontend_ui/build/index.html
 ADD_CUSTOM_TARGET(frontend DEPENDS frontend_ui/build/index.html)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/
-        DESTINATION jfjoch/kernel
+        DESTINATION share/jfjoch/kernel
         COMPONENT jfjoch
         FILES_MATCHING PATTERN "*.c" PATTERN "*.h" PATTERN "Makefile" PATTERN "dkms.conf" PATTERN "install.dkms")
-INSTALL(DIRECTORY frontend_ui/build/ DESTINATION jfjoch/frontend COMPONENT jfjoch )
+INSTALL(DIRECTORY frontend_ui/build/ DESTINATION share/jfjoch/frontend COMPONENT jfjoch )
 
 IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   SET(CMAKE_INSTALL_PREFIX /opt/jfjoch CACHE PATH "Default directory" FORCE)