diff --git a/pki-servlet-engine.spec b/pki-servlet-engine.spec
index 0ab3286..8f8e1c3 100644
--- a/pki-servlet-engine.spec
+++ b/pki-servlet-engine.spec
@@ -58,7 +58,7 @@
 Name:          pki-servlet-engine
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 Group:         System Environment/Daemons
 License:       ASL 2.0
@@ -88,17 +88,16 @@ BuildArch:     noarch
 
 BuildRequires: ant
 BuildRequires: findutils
-BuildRequires: java-devel >= 1:1.8.0
-BuildRequires: jpackage-utils >= 0:1.7.0
+BuildRequires: java-11-devel
+BuildRequires: javapackages-tools
 BuildRequires: maven-local
 BuildRequires: jakarta-saaj
 BuildRequires: systemd
 BuildRequires: systemd-rpm-macros
 
 Requires:      ant
-Requires:      java-headless >= 1:1.8.0
-Requires:      java-devel >= 1:1.8.0
-Requires:      jpackage-utils
+Requires:      java-11-devel
+Requires:      javapackages-tools
 Requires:      procps
 Requires:      jakarta-saaj
 Requires(pre):    shadow-utils
@@ -465,6 +464,9 @@ fi
 %{_mavenpomdir}/JPP-tomcat-servlet-api.pom
 
 %changelog
+* Tue Jun 08 2021 Coty Sutherland <csutherl@redhat.com> - 1:9.0.30-3
+- Resolves: rhbz#1963851 CA instance installation fails with error message
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:9.0.30-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
diff --git a/tomcat-9.0-catalina-policy.patch b/tomcat-9.0-catalina-policy.patch
index c8c5c08..9d7018b 100644
--- a/tomcat-9.0-catalina-policy.patch
+++ b/tomcat-9.0-catalina-policy.patch
@@ -1,9 +1,15 @@
---- conf/catalina.policy.orig	2018-06-21 13:30:04.074492012 -0400
-+++ conf/catalina.policy	2018-06-21 13:30:02.111479809 -0400
-@@ -50,6 +50,30 @@ grant codeBase "file:${java.home}/lib/ex
+--- conf/catalina.policy.orig	2021-06-08 09:27:09.295927384 -0400
++++ conf/catalina.policy	2021-06-08 09:26:32.056019150 -0400
+@@ -50,6 +50,36 @@ grant codeBase "file:${java.home}/lib/ex
          permission java.security.AllPermission;
  };
  
++// This permission is required when using javac to compile JSPs on Java 9
++// onwards
++grant codeBase "jrt:/jdk.compiler" {
++        permission java.security.AllPermission;
++};
++
 +// ========== RHEL SPECIFIC CODE PERMISSIONS =======================================
 +
 +// Allowing everything in /usr/share/java allows too many unknowns to be permitted