diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec
index eb9fc8e..5ca85b0 100644
--- a/java-1_8_0-openj9.spec
+++ b/java-1_8_0-openj9.spec
@@ -127,7 +127,6 @@ Patch203:       system-lcms.patch
 Patch205:       link-with-as-needed.patch
 
 Patch210:       openj9-no-werror.patch
-Patch211:       gcc10.patch
 
 Patch300:       alternative-path-to-tzdb_dat.patch
 
@@ -369,7 +368,6 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 %patch205 -p1
 
 %patch210
-%patch211 -p1
 
 %patch1 -p1
 %patch2 -p1
diff --git a/java-atk-wrapper-security.patch b/java-atk-wrapper-security.patch
index 8360511..6c79bdb 100644
--- a/java-atk-wrapper-security.patch
+++ b/java-atk-wrapper-security.patch
@@ -1,22 +1,22 @@
---- jdk8/jdk/src/share/lib/security/java.security-linux	2014-07-15 23:08:27.000000000 +0200
-+++ jdk8/jdk/src/share/lib/security/java.security-linux	2014-07-18 09:04:45.127566697 +0200
-@@ -224,7 +224,9 @@
-                com.ibm.oti.,\
-                openj9.internal.,\
-                jdk.xml.internal.,\
--               com.sun.activation.registries.
-+               com.sun.activation.registries.,\
+--- openjdk/jdk/src/share/lib/security/java.security-linux	2014-07-15 23:08:27.000000000 +0200
++++ openjdk/jdk/src/share/lib/security/java.security-linux	2014-07-18 09:04:45.127566697 +0200
+@@ -227,7 +227,9 @@
+                com.sun.activation.registries.,\
+                jdk.jfr.events.,\
+                jdk.jfr.internal.,\
+-               jdk.management.jfr.internal.
++               jdk.management.jfr.internal.\
 +               org.GNOME.Accessibility.,\
 +               org.GNOME.Bonobo.
  
  #
  # List of comma-separated packages that start with or equal this string
-@@ -274,7 +276,9 @@
-                    jdk.nashorn.internal.,\
-                    jdk.nashorn.tools.,\
-                    jdk.xml.internal.,\
--                   com.sun.activation.registries.
-+                   com.sun.activation.registries.,\
+@@ -280,7 +282,9 @@
+                    com.sun.activation.registries.,\
+                    jdk.jfr.events.,\
+                    jdk.jfr.internal.,\
+-                   jdk.management.jfr.internal.
++                   jdk.management.jfr.internal.\
 +                   org.GNOME.Accessibility.,\
 +                   org.GNOME.Bonobo.
  
diff --git a/openj9-no-werror.patch b/openj9-no-werror.patch
index 6600fce..90ce1ee 100644
--- a/openj9-no-werror.patch
+++ b/openj9-no-werror.patch
@@ -26,23 +26,23 @@
  endif
 --- omr/omrmakefiles/rules.linux.mk	2020-04-14 14:43:05.000000000 +0200
 +++ omr/omrmakefiles/rules.linux.mk	2020-06-26 08:19:16.264774446 +0200
-@@ -348,15 +348,15 @@
+@@ -345,15 +345,15 @@
  ifeq ($(OMR_WARNINGS_AS_ERRORS),1)
-     ifeq (ppc,$(OMR_HOST_ARCH))
-         ifeq (gcc,$(OMR_TOOLCHAIN))
--            GLOBAL_CFLAGS += -Wreturn-type -Werror
--            GLOBAL_CXXFLAGS += -Wreturn-type -Werror
-+            GLOBAL_CFLAGS += -Wreturn-type
-+            GLOBAL_CXXFLAGS += -Wreturn-type
-         else
-             GLOBAL_CFLAGS += -qhalt=w
-             GLOBAL_CXXFLAGS += -qhalt=w
-         endif
+   ifeq (ppc,$(OMR_HOST_ARCH))
+     ifeq (gcc,$(OMR_TOOLCHAIN))
+-      GLOBAL_CFLAGS += -Wreturn-type -Werror
+-      GLOBAL_CXXFLAGS += -Wreturn-type -Werror
++      GLOBAL_CFLAGS += -Wreturn-type
++      GLOBAL_CXXFLAGS += -Wreturn-type
      else
--        GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type -Werror
--        GLOBAL_CXXFLAGS+=-Wreturn-type -Werror
-+        GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type
-+        GLOBAL_CXXFLAGS+=-Wreturn-type
+       GLOBAL_CFLAGS += -qhalt=w
+       GLOBAL_CXXFLAGS += -qhalt=w
      endif
+   else
+-    GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type -Werror
+-    GLOBAL_CXXFLAGS+=-Wreturn-type -Werror
++    GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type
++    GLOBAL_CXXFLAGS+=-Wreturn-type
+   endif
  endif
  
diff --git a/system-lcms.patch b/system-lcms.patch
index ccd080a..a176a7d 100644
--- a/system-lcms.patch
+++ b/system-lcms.patch
@@ -50,7 +50,7 @@
 --- jdk8/jdk/make/lib/Awt2dLibraries.gmk	2014-09-26 08:49:00.981751504 +0200
 +++ jdk8/jdk/make/lib/Awt2dLibraries.gmk	2014-09-26 08:50:22.897853978 +0200
 @@ -669,8 +669,8 @@
- ##########################################################################################
+ endif
  
  # TODO: Update awt lib path when awt is converted
 -$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \