diff --git a/tomcat-9.0.conf b/tomcat-9.0.conf
index e5fa60a..6e9eed1 100644
--- a/tomcat-9.0.conf
+++ b/tomcat-9.0.conf
@@ -35,7 +35,7 @@ CATALINA_TMPDIR="/var/cache/tomcat/temp"
 #JAVA_OPTS="-Djava.library.path=/usr/lib"
 
 # Set default javax.sql.DataSource factory to apache commons one. See rhbz#1214381
-JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory"
+JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory"
 
 # You can change your tomcat locale here
 #LANG="en_US"
diff --git a/tomcat.spec b/tomcat.spec
index 7145845..89622a2 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -550,6 +550,9 @@ fi
 %{appdir}/ROOT
 
 %changelog
+* Mon Oct 16 2023 Hui Wang <huwang@redhat.com> - 1:9.0.82-2
+- Update tomcat-9.0.conf
+
 * Mon Oct 16 2023 Hui Wang <huwang@redhat.com> - 1:9.0.82-1
 - Update to 9.0.82
 - Resolves: rhbz#2243613 [Major Incident] CVE-2023-44487 tomcat