diff --git a/.gitignore b/.gitignore
index 43e4f8f..117673b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /pki-10.10.0.tar.gz
 /pki-10.10.2.tar.gz
 /pki-10.10.3.tar.gz
+/pki-10.10.5.tar.gz
diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index f8cc368..b340ec0 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -12,8 +12,8 @@ License:          GPLv2 and LGPLv2
 
 # For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
 # For official (i.e. supported) releases, use x.y.z-r where r >=1.
-Version:          10.10.3
-Release:          2%{?_timestamp}%{?_commit_id}%{?dist}
+Version:          10.10.5
+Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -beta1
 
 # To create a tarball from a version tag:
@@ -848,14 +848,8 @@ java_version=`%{java_home}/bin/java -XshowSettings:properties -version 2>&1 | se
 # otherwise get <major> version number
 java_version=`echo $java_version | sed -e 's/^1\.//' -e 's/\..*$//'`
 
-# get Tomcat <major>.<minor> version number
-tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'`
-
-if [ $tomcat_version == "9.0" ]; then
-    app_server=tomcat-8.5
-else
-    app_server=tomcat-$tomcat_version
-fi
+# assume tomcat app_server 
+app_server=tomcat-8.5
 
 %if 0%{?rhel}
 %{__mkdir_p} build
@@ -1385,6 +1379,9 @@ fi
 
 ################################################################################
 %changelog
+* Thu Feb 25 2021 Dogtag PKI Team <pki-devel@redhat.com> - 10.10.5-1
+- Rebase to upstream stable v10.10.5 release
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 10.10.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 6e8d0db..0750a4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.10.3.tar.gz) = 130c9f0715570e08db73731cbcf01d8adb36589ac09d335801ac4b217a8b2c4c35e09b28e8dd80a0fbf0ea81984f8d7cc47d6fd758832f74efbf3e5f4edf47c1
+SHA512 (pki-10.10.5.tar.gz) = 2a70a4dc152e10eb27be7620e876db8237b97af0d3c1d56f840e68ea6035c01f5801318f371ec65d3aa24f505db373b77e6635ba8ed1a95d20a9fc657e9977d5