diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 8ad9408a376..fd491c0ec0e 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -50,6 +50,6 @@ jobs:
 
       - name: Uncrustify check
         run: |
-          ~/uncrustify/uncrustify -c .uncrustify.cfg -l CPP --no-backup --replace */*.cpp */*.h
+          UNCRUSTIFY=~/uncrustify/uncrustify ./runformat
           git diff
           git diff | diff - /dev/null &> /dev/null
diff --git a/runformat b/runformat
index 60ad1b2abe1..c02d9b117cd 100755
--- a/runformat
+++ b/runformat
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# uncrustify-0.72 is used to format cppcheck source code.
+# uncrustify-0.80.1 is used to format cppcheck source code.
 #
-# 1. Download source code: https://github.com/uncrustify/uncrustify/archive/refs/tags/uncrustify-0.72.0.zip
+# 1. Download source code: https://github.com/uncrustify/uncrustify/archive/refs/tags/uncrustify-0.80.1.zip
 #    It's important that all Cppcheck developers use the exact same version so we don't get a "format battle".
 # 2. Building:
 #    - Linux: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make
@@ -11,7 +11,7 @@
 #    - you can put uncrustify in your PATH
 #    - you can create an environment variable UNCRUSTIFY that has the full path of the binary
 
-UNCRUSTIFY_VERSION="0.72.0"
+UNCRUSTIFY_VERSION="0.80.1"
 UNCRUSTIFY="${UNCRUSTIFY-uncrustify}"
 
 DETECTED_VERSION=$("$UNCRUSTIFY" --version 2>&1 | grep -o -E '[0-9.]+')
@@ -40,7 +40,7 @@ function formatCplusplus {
   find $1 -iname '*.h' \
       -o -iname '*.c' \
       -o -iname '*.cpp' \
-      | xargs -n 1 -P $CPUCOUNT -I{} -t $UNCRUSTIFY -c .uncrustify.cfg --no-backup {}
+      | xargs -n 1 -P $CPUCOUNT $UNCRUSTIFY -c .uncrustify.cfg -l CPP --no-backup --replace
 
 }
 
@@ -51,4 +51,3 @@ formatCplusplus lib/
 formatCplusplus oss-fuzz/
 formatCplusplus test/
 formatCplusplus tools/
-formatCplusplus samples/
diff --git a/samples/passedByValue_1/bad.cpp b/samples/passedByValue_1/bad.cpp
index 413b4327a74..55dea528d3d 100644
--- a/samples/passedByValue_1/bad.cpp
+++ b/samples/passedByValue_1/bad.cpp
@@ -2,9 +2,8 @@ class C
 {
 public:
     explicit C(std::string s)
-    : _s(s)
-    {
-    }
+        : _s(s)
+    {}
     void foo();
 private:
     std::string _s;
diff --git a/samples/passedByValue_1/good.cpp b/samples/passedByValue_1/good.cpp
index fd1f1450d17..e2af869a8cb 100644
--- a/samples/passedByValue_1/good.cpp
+++ b/samples/passedByValue_1/good.cpp
@@ -2,9 +2,8 @@ class C
 {
 public:
     explicit C(std::string s)
-    : _s(std::move(s))
-    {
-    }
+        : _s(std::move(s))
+    {}
     void foo();
 private:
     std::string _s;
diff --git a/test/cfg/boost.cpp b/test/cfg/boost.cpp
index 7e724a8b472..adbabc0dab3 100644
--- a/test/cfg/boost.cpp
+++ b/test/cfg/boost.cpp
@@ -145,8 +145,8 @@ void test_BOOST_FOREACH_3(std::vector<int> data)
 void test_BOOST_FOREACH_4(std::vector<int> data)
 {
     BOOST_FOREACH(const int& i, data)
-        // cppcheck-suppress invalidContainerLoop
-        data.clear();
+    // cppcheck-suppress invalidContainerLoop
+    data.clear();
 }
 
 // Container returned as result of a function -> Be quiet
@@ -155,7 +155,7 @@ void test_BOOST_FOREACH_5()
 {
     std::set<int> data;
     BOOST_FOREACH(const int& i, get_data())
-        data.insert(i);
+    data.insert(i);
 }
 
 // Break after modification (#4788)
diff --git a/test/cfg/googletest.cpp b/test/cfg/googletest.cpp
index eaec730136d..c7cad8ac796 100644
--- a/test/cfg/googletest.cpp
+++ b/test/cfg/googletest.cpp
@@ -33,13 +33,11 @@ namespace ExampleNamespace {
 
     // syntaxError when TYPED_TEST is not known
     TYPED_TEST (ExampleTypedTest, cppcheck_test)
-    {
-    }
+    {}
 
     // syntaxError when TYPED_TEST_P is not known
     TYPED_TEST_P (ExampleTypedTestP, cppcheck)
-    {
-    }
+    {}
 }
 
 TEST(ASSERT, ASSERT)
diff --git a/test/cfg/kde.cpp b/test/cfg/kde.cpp
index 71533ca781f..16b88712399 100644
--- a/test/cfg/kde.cpp
+++ b/test/cfg/kde.cpp
@@ -49,7 +49,7 @@ class PluginWithoutMetaData : public QObject
 public:
     // Add a default arg to make sure we do not get an ambiguity compiler error
     explicit PluginWithoutMetaData(const QObject *, const QVariantList &args = {})
-    : QObject()
+        : QObject()
     {
         Q_UNUSED(args)
     };
@@ -64,7 +64,7 @@ class StaticSimplePluginClass : public QObject
 public:
     // Next to the assertion below, ensure that we have no ambiguity!
     explicit StaticSimplePluginClass(QObject *parent, const QString &data = {})
-    : QObject(parent)
+        : QObject(parent)
     {
         // We have added a default arg, but KPluginFactory should still provide the valid metadata instead of the default one
         data = QString("foo");
diff --git a/test/cfg/posix.c b/test/cfg/posix.c
index 2e53d171dec..1aca529259d 100644
--- a/test/cfg/posix.c
+++ b/test/cfg/posix.c
@@ -1043,7 +1043,7 @@ void* f_returns_NULL(void* arg)
 void nullPointer_pthread_create() // #12396
 {
     pthread_t thread;
-    pthread_create(&thread, NULL, (void* (*)(void*))f_returns_NULL, NULL);
+    pthread_create(&thread, NULL, (void* (*)(void*)) f_returns_NULL, NULL);
 }
 
 void memleak_getaddrinfo() // #6994
diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index d508eeef487..c3ba680eed5 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -860,5 +860,5 @@ int qdateIsValid()
 {
     QDate qd(1,1,2025);
     Q_ASSERT(qd.isValid()); // Should not warn here with assertWithSideEffect
-    return qd.month(); 
+    return qd.month();
 }
diff --git a/test/cfg/std.c b/test/cfg/std.c
index 32b6fe61534..8aab8fff108 100644
--- a/test/cfg/std.c
+++ b/test/cfg/std.c
@@ -3161,11 +3161,11 @@ void uninitvar_vwprintf(const wchar_t *Format, va_list Arg)
 void nullPointer_bsearch(const void* key, const void* base, size_t num, size_t size)
 {
     // cppcheck-suppress nullPointer
-    (void)bsearch(NULL,base,num,size,(int (*)(const void*,const void*))strcmp);
+    (void)bsearch(NULL,base,num,size,(int (*)(const void*,const void*)) strcmp);
     // cppcheck-suppress nullPointer
-    (void)bsearch(key,NULL,num,size,(int (*)(const void*,const void*))strcmp);
+    (void)bsearch(key,NULL,num,size,(int (*)(const void*,const void*)) strcmp);
     // No warning is expected
-    (void)bsearch(key,base,num,size,(int (*)(const void*,const void*))strcmp);
+    (void)bsearch(key,base,num,size,(int (*)(const void*,const void*)) strcmp);
 }
 
 void uninitvar_bsearch(void)
@@ -3175,7 +3175,7 @@ void uninitvar_bsearch(void)
     size_t num;
     size_t size;
     // cppcheck-suppress uninitvar
-    (void)bsearch(key,base,num,size,(int (*)(const void*,const void*))strcmp);
+    (void)bsearch(key,base,num,size,(int (*)(const void*,const void*)) strcmp);
 }
 
 void uninitvar_qsort(void)
@@ -3184,7 +3184,7 @@ void uninitvar_qsort(void)
     size_t n;
     size_t size;
     // cppcheck-suppress uninitvar
-    (void)qsort(base,n,size, (int (*)(const void*,const void*))strcmp);
+    (void)qsort(base,n,size, (int (*)(const void*,const void*)) strcmp);
 }
 
 void uninitvar_putc(void)
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index 455dbf7df7c..eb1356ec28a 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -90,12 +90,12 @@ int ignoredReturnValue_std_clamp(const int x)
 void knownConditionTrueFalse_std_clamp(const int x)
 {
     // cppcheck-suppress knownConditionTrueFalse
-    if(std::clamp(-2, -1, 1) == -1){}
+    if (std::clamp(-2, -1, 1) == -1) {}
     // cppcheck-suppress knownConditionTrueFalse
-    if(std::clamp(2, -1, 1) == 1){}
+    if (std::clamp(2, -1, 1) == 1) {}
     // cppcheck-suppress knownConditionTrueFalse
-    if(std::clamp(0, -1, 1) == 0){}
-    if(std::clamp(x, 0, 2)){}
+    if (std::clamp(0, -1, 1) == 0) {}
+    if (std::clamp(x, 0, 2)) {}
 }
 #endif // __cpp_lib_clamp
 
@@ -3263,7 +3263,7 @@ void uninivar_bsearch(void)
     size_t num;
     size_t size;
     // cppcheck-suppress [uninitvar, cstyleCast]
-    (void)std::bsearch(key,base,num,size,(int (*)(const void*,const void*))strcmp);
+    (void)std::bsearch(key,base,num,size,(int (*)(const void*,const void*)) strcmp);
 }
 
 void minsize_bsearch(const void* key, const void* base,
@@ -3272,11 +3272,11 @@ void minsize_bsearch(const void* key, const void* base,
 {
     const int Base[3] = {42, 43, 44};
 
-    (void)std::bsearch(key,Base,2,size,(int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
-    (void)std::bsearch(key,Base,3,size,(int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
-    (void)std::bsearch(key,Base,4,size,(int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
+    (void)std::bsearch(key,Base,2,size,(int (*)(const void*,const void*)) strcmp); // cppcheck-suppress cstyleCast
+    (void)std::bsearch(key,Base,3,size,(int (*)(const void*,const void*)) strcmp); // cppcheck-suppress cstyleCast
+    (void)std::bsearch(key,Base,4,size,(int (*)(const void*,const void*)) strcmp); // cppcheck-suppress cstyleCast
 
-    (void)std::bsearch(key,base,2,size,(int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
+    (void)std::bsearch(key,base,2,size,(int (*)(const void*,const void*)) strcmp); // cppcheck-suppress cstyleCast
 }
 
 void uninitvar_qsort(void)
@@ -3285,7 +3285,7 @@ void uninitvar_qsort(void)
     size_t n;
     size_t size;
     // cppcheck-suppress uninitvar
-    (void)std::qsort(base,n,size, (int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
+    (void)std::qsort(base,n,size, (int (*)(const void*,const void*)) strcmp); // cppcheck-suppress cstyleCast
 }
 
 void uninitvar_stable_sort(std::vector<int>& v)
diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
index 5951cb74c07..b99fc35a5d9 100644
--- a/test/cfg/windows.cpp
+++ b/test/cfg/windows.cpp
@@ -1211,8 +1211,6 @@ void SEH_knownConditionTrueFalse() { // #8434
 }
 
 void SEH_unusedLabel() { // #13233
-    __try {
-    }
-    __finally {
-    }
+    __try {}
+    __finally {}
 }