diff --git a/.github/workflows/self-hosted.yml b/.github/workflows/self-hosted.yml
index e5cc9fd4..a8afc47b 100644
--- a/.github/workflows/self-hosted.yml
+++ b/.github/workflows/self-hosted.yml
@@ -12,7 +12,7 @@ jobs:
       run: rm -rf /home/pi/actions-runner/_work/snapcast/snap*_armhf.deb
     - uses: actions/checkout@v2
     - name: cmake build
-      run: mkdir build && cd build && cmake -DBOOST_ROOT=/home/pi/Develop/boost_1_74_0 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && cd ..
+      run: mkdir build && cd build && cmake -DBOOST_ROOT=/home/pi/Develop/boost_1_74_0 -DCMAKE_BUILD_TYPE=Release -DWERROR=ON -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-psabi" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && cd ..
     - name: cmake make
       run: cmake --build build
     - name: debian package
diff --git a/server/control_session_http.hpp b/server/control_session_http.hpp
index 56016721..ff43fc27 100644
--- a/server/control_session_http.hpp
+++ b/server/control_session_http.hpp
@@ -21,10 +21,14 @@
 
 #include "control_session.hpp"
 #include <boost/beast/core.hpp>
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuninitialized"
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #include <boost/beast/websocket.hpp>
 #pragma GCC diagnostic pop
+#else
+#include <boost/beast/websocket.hpp>
+#endif
 #include <deque>
 
 namespace beast = boost::beast;         // from <boost/beast.hpp>
diff --git a/server/control_session_ws.hpp b/server/control_session_ws.hpp
index fb8d9ced..c5836b46 100644
--- a/server/control_session_ws.hpp
+++ b/server/control_session_ws.hpp
@@ -21,10 +21,7 @@
 
 #include "control_session.hpp"
 #include <boost/beast/core.hpp>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuninitialized"
 #include <boost/beast/websocket.hpp>
-#pragma GCC diagnostic pop
 #include <deque>
 
 namespace beast = boost::beast;         // from <boost/beast.hpp>
diff --git a/server/stream_session_ws.hpp b/server/stream_session_ws.hpp
index c18212a6..201ae848 100644
--- a/server/stream_session_ws.hpp
+++ b/server/stream_session_ws.hpp
@@ -21,10 +21,7 @@
 
 #include "stream_session.hpp"
 #include <boost/beast/core.hpp>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuninitialized"
 #include <boost/beast/websocket.hpp>
-#pragma GCC diagnostic pop
 #include <deque>
 
 namespace beast = boost::beast;         // from <boost/beast.hpp>