diff --git a/Framework/Core/src/ArrowSupport.cxx b/Framework/Core/src/ArrowSupport.cxx
index 1dcc85c1d4f04..12a4c7131e828 100644
--- a/Framework/Core/src/ArrowSupport.cxx
+++ b/Framework/Core/src/ArrowSupport.cxx
@@ -46,8 +46,6 @@
 #include <boost/program_options/variables_map.hpp>
 #include <csignal>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpedantic"
 namespace o2::framework
 {
 
@@ -596,4 +594,3 @@ o2::framework::ServiceSpec ArrowSupport::arrowTableSlicingCacheSpec()
 }
 
 } // namespace o2::framework
-#pragma GGC diagnostic pop
diff --git a/Framework/Core/src/CallbacksPolicy.cxx b/Framework/Core/src/CallbacksPolicy.cxx
index 9be04cdef290d..aa22fa830c4c2 100644
--- a/Framework/Core/src/CallbacksPolicy.cxx
+++ b/Framework/Core/src/CallbacksPolicy.cxx
@@ -20,10 +20,6 @@
 #include <cstdlib>
 #include <uv.h>
 
-// This is to allow C++20 aggregate initialisation
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpedantic"
-
 namespace o2::framework
 {
 
diff --git a/Framework/Core/src/CommonMessageBackends.cxx b/Framework/Core/src/CommonMessageBackends.cxx
index f3bf36edca8ea..79bd84307df15 100644
--- a/Framework/Core/src/CommonMessageBackends.cxx
+++ b/Framework/Core/src/CommonMessageBackends.cxx
@@ -33,10 +33,6 @@
 #include <boost/program_options/variables_map.hpp>
 #include <csignal>
 
-// This is to allow C++20 aggregate initialisation
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpedantic"
-
 namespace o2::framework
 {
 
diff --git a/Framework/Core/src/CommonServices.cxx b/Framework/Core/src/CommonServices.cxx
index 23375b76487b9..95836adc02171 100644
--- a/Framework/Core/src/CommonServices.cxx
+++ b/Framework/Core/src/CommonServices.cxx
@@ -77,10 +77,6 @@ using Metric = o2::monitoring::Metric;
 using Key = o2::monitoring::tags::Key;
 using Value = o2::monitoring::tags::Value;
 
-// This is to allow C++20 aggregate initialisation
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpedantic"
-
 O2_DECLARE_DYNAMIC_LOG(data_processor_context);
 O2_DECLARE_DYNAMIC_LOG(stream_context);
 O2_DECLARE_DYNAMIC_LOG(async_queue);
@@ -1327,4 +1323,3 @@ std::vector<ServiceSpec> CommonServices::arrowServices()
 }
 
 } // namespace o2::framework
-#pragma GCC diagnostic pop
diff --git a/Framework/Core/src/runDataProcessing.cxx b/Framework/Core/src/runDataProcessing.cxx
index e5263247e641b..c8f77ab7082e6 100644
--- a/Framework/Core/src/runDataProcessing.cxx
+++ b/Framework/Core/src/runDataProcessing.cxx
@@ -134,9 +134,6 @@
 #include <unistd.h>
 #include <execinfo.h>
 #include <cfenv>
-// This is to allow C++20 aggregate initialisation
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpedantic"
 #if defined(__linux__) && __has_include(<sched.h>)
 #include <sched.h>
 #elif __has_include(<linux/getcpu.h>)
diff --git a/Framework/Core/test/test_ComputingQuotaEvaluator.cxx b/Framework/Core/test/test_ComputingQuotaEvaluator.cxx
index cd0d79538e12a..0df58ae7fed08 100644
--- a/Framework/Core/test/test_ComputingQuotaEvaluator.cxx
+++ b/Framework/Core/test/test_ComputingQuotaEvaluator.cxx
@@ -19,8 +19,6 @@
 #include "Framework/ServiceRegistryHelpers.h"
 #include "uv.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpedantic"
 using namespace o2::framework;
 
 TEST_CASE("TestComputingQuotaEvaluator")
@@ -219,5 +217,3 @@ TEST_CASE("TestComputingQuotaEvaluator")
   REQUIRE(evaluator.mOffers[1].valid == false);
   REQUIRE(evaluator.mOffers[2].valid == false);
 }
-
-#pragma GGC diagnostic pop
diff --git a/Framework/Core/test/test_DataProcessorSpec.cxx b/Framework/Core/test/test_DataProcessorSpec.cxx
index 9bebd06f15b43..48e59c95475ba 100644
--- a/Framework/Core/test/test_DataProcessorSpec.cxx
+++ b/Framework/Core/test/test_DataProcessorSpec.cxx
@@ -14,9 +14,6 @@
 #include "Framework/DataProcessorSpecHelpers.h"
 #include "Framework/ConfigParamSpec.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpedantic"
-
 TEST_CASE("TestDataProcessorSpecHelpers")
 {
   using namespace o2::framework;
@@ -35,5 +32,3 @@ TEST_CASE("TestDataProcessorSpecHelpers")
   REQUIRE(DataProcessorSpecHelpers::hasLabel(spec, "label2") == false);
   REQUIRE(DataProcessorSpecHelpers::hasLabel(spec, "label3") == true);
 }
-
-#pragma diagnostic pop
diff --git a/Framework/Foundation/include/Framework/Signpost.h b/Framework/Foundation/include/Framework/Signpost.h
index 74368f73c382e..ba807865a1195 100644
--- a/Framework/Foundation/include/Framework/Signpost.h
+++ b/Framework/Foundation/include/Framework/Signpost.h
@@ -90,11 +90,10 @@ o2_log_handle_t* o2_walk_logs(bool (*callback)(char const* name, void* log, void
 #include <os/log.h>
 #include <os/signpost.h>
 #include <cstring>
-#define O2_LOG_DEBUG_MAC(log, ...) os_log_debug(private_o2_log_##log, __VA_ARGS__)
-// FIXME: use __VA_OPT__ when available in C++20
-#define O2_SIGNPOST_EVENT_EMIT_MAC(log, id, name, format, ...) os_signpost_event_emit(private_o2_log_##log->os_log, (uint64_t)id.value, name, format, ##__VA_ARGS__)
-#define O2_SIGNPOST_START_MAC(log, id, name, format, ...) os_signpost_interval_begin(private_o2_log_##log->os_log, (uint64_t)id.value, name, format, ##__VA_ARGS__)
-#define O2_SIGNPOST_END_MAC(log, id, name, format, ...) os_signpost_interval_end(private_o2_log_##log->os_log, (uint64_t)id.value, name, format, ##__VA_ARGS__)
+#define O2_LOG_DEBUG_MAC(log, format, ...) os_log_debug(private_o2_log_##log, format __VA_OPT__(, ) __VA_ARGS__)
+#define O2_SIGNPOST_EVENT_EMIT_MAC(log, id, name, format, ...) os_signpost_event_emit(private_o2_log_##log->os_log, (uint64_t)id.value, name, format __VA_OPT__(, ) __VA_ARGS__)
+#define O2_SIGNPOST_START_MAC(log, id, name, format, ...) os_signpost_interval_begin(private_o2_log_##log->os_log, (uint64_t)id.value, name, format __VA_OPT__(, ) __VA_ARGS__)
+#define O2_SIGNPOST_END_MAC(log, id, name, format, ...) os_signpost_interval_end(private_o2_log_##log->os_log, (uint64_t)id.value, name, format __VA_OPT__(, ) __VA_ARGS__)
 #define O2_SIGNPOST_ENABLED_MAC(log) os_signpost_enabled(private_o2_log_##log->os_log)
 #else
 // These are no-ops on linux.