diff --git a/pack.cmake b/pack.cmake
index ecffabf..9c992d9 100755
--- a/pack.cmake
+++ b/pack.cmake
@@ -22,18 +22,21 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Bartosz Wieczorek")
 
 #set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
 #set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-set(CPACK_DEBIAN_PAM-DEV_PACKAGE_NAME, yes)
-set(CPACK_DEBIAN_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_${LSB_RELEASE_ID_SHORT}${outOS}.deb)
-set(CPACK_DEBIAN_PAM-DEV_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_PAM-DEV_${LSB_RELEASE_ID_SHORT}${outOS}.deb)
-set(CPACK_DEB_COMPONENT_INSTALL YES)
-
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS YES)
 execute_process (
     COMMAND bash -c "awk -F= '/^ID=/{print $2}' /etc/os-release |tr -d '\n' | tr -d '\"'"
     OUTPUT_VARIABLE outOS
 )
-
 if ( ${outOS} MATCHES "ubuntu" OR ${outOS} MATCHES "debian" )
+set(CPACK_DEBIAN_PAM-DEV_PACKAGE_NAME, yes)
+set(CPACK_DEB_COMPONENT_INSTALL YES)
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS YES)
+
+execute_process (
+    COMMAND bash -c "awk -F= '/^VERSION_ID=/{print $2}' /etc/os-release |tr -d '\n' | tr -d '\"'"
+    OUTPUT_VARIABLE VERSION_ID
+)
+set(CPACK_DEBIAN_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_${outOS}${VERSION_ID}.deb")
+set(CPACK_DEBIAN_PAM-DEV_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_PAM-DEV_${outOS}${VERSION_ID}.deb")
 set(CPACK_GENERATOR "DEB")
 set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "libcurl4(>= 7.0.0), libc-bin(>= 2.0)")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcurl4(>= 7.0.0), libc-bin(>= 2.0), libssl-dev(>= 1.0)")
@@ -48,7 +51,7 @@ list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
 
 set(CPACK_RPM_SPEC_MORE_DEFINE "%define _build_id_links none")
 set(CPACK_RPM_PAM-DEV_PACKAGE_NAME, yes)
-set(CPACK_RPM_PAM-DEV_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_PAM-DEV_${outOS}.deb)
+
 if ( ${outOS} MATCHES "opensuse-leap" )
 set(CPACK_RPM_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_${outOS}.rpm")
 set(CPACK_RPM_PACKAGE_REQUIRES "openssh >= 8.0")
@@ -61,6 +64,7 @@ execute_process (
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 set(CPACK_RPM_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_${outOS}.${VERSION}.rpm")
+set(CPACK_RPM_PAM-DEV_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_PAM-DEV_${outOS}_${VERSION}.rpm")
 set(CPACK_RPM_PACKAGE_REQUIRES_PRE "policycoreutils-python-utils")
 	if(${VERSION} MATCHES ".el8" OR ${outOS} MATCHES "opensuse-leap")
 	set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/service/helpers/postinst_rhel_8")