diff --git a/src/lib/deskflow/unix/X11LayoutsParser.cpp b/src/lib/deskflow/unix/X11LayoutsParser.cpp
index 540438a65..0c6f3f280 100644
--- a/src/lib/deskflow/unix/X11LayoutsParser.cpp
+++ b/src/lib/deskflow/unix/X11LayoutsParser.cpp
@@ -95,7 +95,7 @@ std::vector<X11LayoutsParser::Lang> X11LayoutsParser::getAllLanguageData(const s
 void X11LayoutsParser::appendVectorUniq(const std::vector<std::string> &source, std::vector<std::string> &dst)
 {
   for (const auto &elem : source) {
-    if (std::find_if(dst.begin(), dst.end(), [elem](const std::string_view &s) { return s == elem; }) == dst.end()) {
+    if (std::ranges::find_if(dst, [elem](const std::string_view &s) { return s == elem; }) == dst.end()) {
       dst.push_back(elem);
     }
   }
@@ -117,8 +117,7 @@ void X11LayoutsParser::convertLayoutToISO639_2(
       continue;
     }
 
-    auto langIter =
-        std::find_if(allLang.begin(), allLang.end(), [&layoutName](const Lang &l) { return l.name == layoutName; });
+    auto langIter = std::ranges::find_if(allLang, [&layoutName](const Lang &l) { return l.name == layoutName; });
     if (langIter == allLang.end()) {
       LOG((CLOG_WARN "language \"%s\" is unknown", layoutNames[i].c_str()));
       continue;
@@ -131,9 +130,7 @@ void X11LayoutsParser::convertLayoutToISO639_2(
       } else {
         const auto &variantName = layoutVariantNames[i];
         auto langVariantIter =
-            std::find_if(langIter->variants.begin(), langIter->variants.end(), [&variantName](const Lang &l) {
-              return l.name == variantName;
-            });
+            std::ranges::find_if(langIter->variants, [&variantName](const Lang &l) { return l.name == variantName; });
         if (langVariantIter == langIter->variants.end()) {
           LOG(
               (CLOG_WARN "variant \"%s\" of language \"%s\" is unknown", layoutVariantNames[i].c_str(),
@@ -202,10 +199,9 @@ std::vector<std::string> X11LayoutsParser::convertISO639_2ToISO639_1(const std::
 {
   std::vector<std::string> result;
   for (const auto &isoCode : iso639_2Codes) {
-    const auto &tableIter =
-        std::find_if(ISO_Table.begin(), ISO_Table.end(), [&isoCode](const std::pair<std::string, std::string> &c) {
-          return c.first == isoCode;
-        });
+    const auto &tableIter = std::ranges::find_if(ISO_Table, [&isoCode](const std::pair<std::string, std::string> &c) {
+      return c.first == isoCode;
+    });
     if (tableIter == ISO_Table.end()) {
       LOG((CLOG_WARN "the ISO 639-2 code \"%s\" is missed in table", isoCode.c_str()));
       continue;
diff --git a/src/lib/gui/ScreenSetupModel.cpp b/src/lib/gui/ScreenSetupModel.cpp
index 8adc67cd8..ff0ce0834 100644
--- a/src/lib/gui/ScreenSetupModel.cpp
+++ b/src/lib/gui/ScreenSetupModel.cpp
@@ -156,8 +156,6 @@ void ScreenSetupModel::addScreen(const Screen &newScreen)
 
 bool ScreenSetupModel::isFull() const
 {
-  auto emptyScreen =
-      std::find_if(m_Screens.cbegin(), m_Screens.cend(), [](const Screen &item) { return item.isNull(); });
-
+  auto emptyScreen = std::ranges::find_if(m_Screens, [](const Screen &item) { return item.isNull(); });
   return (emptyScreen == m_Screens.cend());
 }
diff --git a/src/lib/gui/dialogs/ServerConfigDialog.cpp b/src/lib/gui/dialogs/ServerConfigDialog.cpp
index 3da1965f4..ec66030a8 100644
--- a/src/lib/gui/dialogs/ServerConfigDialog.cpp
+++ b/src/lib/gui/dialogs/ServerConfigDialog.cpp
@@ -152,7 +152,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
   ui->screenSetupView->setModel(&m_ScreenSetupModel);
 
   auto &screens = serverConfig().screens();
-  auto server = std::find_if(screens.begin(), screens.end(), [this](const Screen &screen) {
+  auto server = std::ranges::find_if(screens, [this](const Screen &screen) {
     return (screen.name() == serverConfig().getServerName());
   });
 
diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp
index 30d33a694..d4871d61a 100644
--- a/src/lib/platform/XWindowsClipboard.cpp
+++ b/src/lib/platform/XWindowsClipboard.cpp
@@ -1016,8 +1016,7 @@ bool XWindowsClipboard::sendReply(Reply *reply)
       LOG((CLOG_DEBUG2 "  %s: <can't read property>", name));
     } else {
       // convert to hex if contains non ascii symbols
-      if (std::find_if(data.begin(), data.end(), [](const unsigned char &c) { return c < 32 || c > 126; }) !=
-          data.end()) {
+      if (std::ranges::find_if(data, [](const unsigned char &c) { return c < 32 || c > 126; }) != data.end()) {
         const std::string hex_digits = "0123456789abcdef";
         std::string tmp;
         tmp.reserve(data.length() * 3);