diff --git a/.github/workflows/docker.sh b/.github/workflows/docker.sh
index c2df5040f..5bb3f364d 100644
--- a/.github/workflows/docker.sh
+++ b/.github/workflows/docker.sh
@@ -9,9 +9,14 @@ title="yuzu Early Access $ver"
 yuzupatch=( $(ls -d patches/* ) )
 for i in "${yuzupatch[@]}"; do patch -p1 < "$i"; done
 
+find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror$/-W/g' {} +
+find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*)$/ )/g' {} +
+find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*$/ /g' {} +
+find . -name "CMakeLists.txt" -exec sed -i 's/-Werror/-W/g' {} +
+
 mkdir build && cd build 
 
-cmake .. -G Ninja -DCMAKE_CXX_FLAGS="-W" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DTITLE_BAR_FORMAT_IDLE="$title" -DTITLE_BAR_FORMAT_RUNNING="$title | {3}" -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DGIT_BRANCH="HEAD" -DGIT_DESC="$msvc" -DUSE_DISCORD_PRESENCE=ON
+cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DTITLE_BAR_FORMAT_IDLE="$title" -DTITLE_BAR_FORMAT_RUNNING="$title | {3}" -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DGIT_BRANCH="HEAD" -DGIT_DESC="$msvc" -DUSE_DISCORD_PRESENCE=ON
 
 ninja
 
diff --git a/patches/disable-shadow-error.patch b/patches/disable-shadow-error.patch
deleted file mode 100644
index 1be6da365..000000000
--- a/patches/disable-shadow-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
-index a021d61f5..15c5dedfb 100644
---- a/src/video_core/CMakeLists.txt
-+++ b/src/video_core/CMakeLists.txt
-@@ -310,7 +310,6 @@ else()
-         -Wno-error=sign-conversion
-         -Werror=pessimizing-move
-         -Werror=redundant-move
--        -Werror=shadow
-         -Werror=switch
-         -Werror=type-limits
-         -Werror=unused-variable
diff --git a/patches/fixvideocorewarns.patch b/patches/fixvideocorewarns.patch
deleted file mode 100644
index 42fc131f9..000000000
--- a/patches/fixvideocorewarns.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/video_core/CMakeLists.txt
-+++ b/src/video_core/CMakeLists.txt
-@@ -299,7 +299,6 @@
-         /we4457 # Declaration of 'identifier' hides function parameter
-         /we4458 # Declaration of 'identifier' hides class member
-         /we4459 # Declaration of 'identifier' hides global declaration
--        /we4715 # 'function' : not all control paths return a value
-     )
- else()
-     target_compile_options(video_core PRIVATE
-@@ -307,10 +305,8 @@
-         -Werror=shadow
-         -Werror=switch
-         -Werror=type-limits
--        -Werror=unused-variable
- 
-         $<$<CXX_COMPILER_ID:GNU>:-Werror=class-memaccess>
-         $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-parameter>
--        $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-variable>
-     )
- endif()
diff --git a/patches/warning-to-warning.patch b/patches/warning-to-warning.patch
deleted file mode 100644
index e41a99253..000000000
--- a/patches/warning-to-warning.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0ce9148a24d8060e226f9815b611ab7852c0730e Mon Sep 17 00:00:00 2001
-From: edisionnano <samantas5855@gmail.com>
-Date: Thu, 5 Nov 2020 11:22:27 +0200
-Subject: [PATCH] Update CMakeLists.txt
-
----
- src/common/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
-index 207c7a0a614..e68cfb6ad8e 100644
---- a/src/common/CMakeLists.txt
-+++ b/src/common/CMakeLists.txt
-@@ -202,7 +202,7 @@ if (MSVC)
-   )
- else()
-   target_compile_options(common PRIVATE
--    -Werror
-+    -W
-   )
- endif()