diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index feefcd5..22f823e 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -9,7 +9,7 @@ Name:             dogtag-pki
 # Upstream version number:
 %global           major_version 11
 %global           minor_version 5
-%global           update_version 3
+%global           update_version 4
 
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
@@ -40,18 +40,21 @@ Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timesta
 #     <version tag>
 Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?phase:-}%{?phase}/pki-%{version}%{?phase:-}%{?phase}.tar.gz
 
-Source1: jackson-annotations-2.16.1.jar
-Source2: jackson-core-2.16.1.jar
-Source3: jackson-databind-2.16.1.jar
-Source4: jackson-module-jaxb-annotations-2.16.1.jar
-Source5: jackson-jaxrs-base-2.16.1.jar
-Source6: jackson-jaxrs-json-provider-2.16.1.jar
-Source7: jboss-jaxrs-2.0-api-1.0.0.Final.jar
-Source8: jboss-logging-3.5.3.Final.jar
-Source9: resteasy-jaxrs-3.0.26.Final.jar
-Source10: resteasy-client-3.0.26.Final.jar
-Source11: resteasy-jackson2-provider-3.0.26.Final.jar
-Source12: resteasy-servlet-initializer-3.0.26.Final.jar
+Source1: jakarta.activation-api-2.1.2.jar
+Source2: jakarta.annotation-api-1.3.5.jar
+Source3: jakarta.xml.bind-4.0.1.jar
+Source4: jackson-annotations-2.16.1.jar
+Source5: jackson-core-2.16.1.jar
+Source6: jackson-databind-2.16.1.jar
+Source7: jackson-module-jaxb-annotations-2.16.1.jar
+Source8: jackson-jaxrs-base-2.16.1.jar
+Source9: jackson-jaxrs-json-provider-2.16.1.jar
+Source10: jboss-jaxrs-2.0-api-1.0.0.Final.jar
+Source11: jboss-logging-3.5.3.Final.jar
+Source12: resteasy-jaxrs-3.0.26.Final.jar
+Source13: resteasy-client-3.0.26.Final.jar
+Source14: resteasy-jackson2-provider-3.0.26.Final.jar
+Source15: resteasy-servlet-initializer-3.0.26.Final.jar
 
 # To create a patch for all changes since a version tag:
 # $ git format-patch \
@@ -220,10 +223,12 @@ BuildRequires:    mvn(xml-apis:xml-apis)
 BuildRequires:    mvn(xml-resolver:xml-resolver)
 BuildRequires:    mvn(org.junit.jupiter:junit-jupiter-api)
 
-BuildRequires:    mvn(jakarta.activation:jakarta.activation-api)
-BuildRequires:    mvn(jakarta.xml.bind:jakarta.xml.bind-api)
 
 %if %{with build_deps}
+BuildRequires:    mvn(jakarta.activation:jakarta.activation-api)
+BuildRequires:    mvn(jakarta.annotation:jakarta.annotation-api)
+BuildRequires:    mvn(jakarta.xml.bind:jakarta.xml.bind-api)
+
 BuildRequires:    mvn(com.fasterxml.jackson.core:jackson-annotations)
 BuildRequires:    mvn(com.fasterxml.jackson.core:jackson-core)
 BuildRequires:    mvn(com.fasterxml.jackson.core:jackson-databind)
@@ -552,10 +557,12 @@ Requires:         mvn(org.apache.commons:commons-lang3)
 Requires:         mvn(org.apache.httpcomponents:httpclient)
 Requires:         mvn(org.slf4j:slf4j-api)
 Requires:         mvn(org.slf4j:slf4j-jdk14)
+
+%if %{with runtime_deps}
+Requires:         mvn(jakarta.activation:jakarta.activation-api)
 Requires:         mvn(jakarta.annotation:jakarta.annotation-api)
 Requires:         mvn(jakarta.xml.bind:jakarta.xml.bind-api)
 
-%if %{with runtime_deps}
 Requires:         mvn(com.fasterxml.jackson.core:jackson-annotations)
 Requires:         mvn(com.fasterxml.jackson.core:jackson-core)
 Requires:         mvn(com.fasterxml.jackson.core:jackson-databind)
@@ -569,6 +576,10 @@ Requires:         mvn(org.jboss.resteasy:resteasy-jaxrs)
 Requires:         mvn(org.jboss.resteasy:resteasy-client)
 Requires:         mvn(org.jboss.resteasy:resteasy-jackson2-provider)
 %else
+Provides:         bundled(jakarta-activation) = 2.1.2
+Provides:         bundled(jakarta-annotations) = 1.3.5
+Provides:         bundled(jaxb-api) = 4.0.1
+
 Provides:         bundled(jackson-annotations) = 2.16.1
 Provides:         bundled(jackson-core) = 2.16.1
 Provides:         bundled(jackson-databind) = 2.16.1
@@ -1045,8 +1056,11 @@ cp %{SOURCE6} .
 cp %{SOURCE7} .
 cp %{SOURCE8} .
 cp %{SOURCE9} .
-cp %{SOURCE10} .
+cp %{SOURCE10} jboss-jaxrs-api_2.0_spec-1.0.0.Final.jar
 cp %{SOURCE11} .
+cp %{SOURCE12} .
+cp %{SOURCE13} .
+cp %{SOURCE14} .
 
 ls -l
 popd
@@ -1055,7 +1069,7 @@ popd
 mkdir -p base/server/lib
 pushd base/server/lib
 
-cp %{SOURCE12} .
+cp %{SOURCE15} .
 
 ls -l
 popd
@@ -1071,6 +1085,31 @@ then
     mkdir -p base/common/lib
     pushd base/common/lib
 
+    JAKARTA_ACTIVATION_API_VERSION=$(rpm -q jakarta-activation | sed -n 's/^jakarta-activation-\([^-]*\)-.*$/\1/p')
+    echo "JAKARTA_ACTIVATION_API_VERSION: $JAKARTA_ACTIVATION_API_VERSION"
+
+    cp /usr/share/java/jakarta-activation/jakarta.activation-api.jar \
+        jakarta.activation-api-$JAKARTA_ACTIVATION_API_VERSION.jar
+
+    JAKARTA_ANNOTATION_API_VERSION=$(rpm -q jakarta-annotations | sed -n 's/^jakarta-annotations-\([^-]*\)-.*$/\1/p')
+    echo "JAKARTA_ANNOTATION_API_VERSION: $JAKARTA_ANNOTATION_API_VERSION"
+
+    cp /usr/share/java/jakarta-annotations/jakarta.annotation-api.jar \
+        jakarta.annotation-api-$JAKARTA_ANNOTATION_API_VERSION.jar
+
+    JAXB_API_VERSION=$(rpm -q jaxb-api | sed -n 's/^jaxb-api-\([^-]*\)-.*$/\1/p')
+    echo "JAXB_API_VERSION: $JAXB_API_VERSION"
+
+    if [ -f /usr/share/java/jaxb-api.jar ]
+    then
+        cp /usr/share/java/jaxb-api.jar \
+            jakarta.xml.bind-api-$JAXB_API_VERSION.jar
+    elif [ -f /usr/share/java/jaxb-api/jakarta.xml.bind-api.jar ]
+    then
+        cp /usr/share/java/jaxb-api/jakarta.xml.bind-api.jar \
+            jakarta.xml.bind-api-$JAXB_API_VERSION.jar
+    fi
+
     JACKSON_VERSION=$(rpm -q jackson-annotations | sed -n 's/^jackson-annotations-\([^-]*\)-.*$/\1/p')
     echo "JACKSON_VERSION: $JACKSON_VERSION"
 
@@ -1091,7 +1130,7 @@ then
     echo "JAXRS_VERSION: $JAXRS_VERSION"
 
     cp /usr/share/java/jboss-jaxrs-2.0-api.jar \
-        jboss-jaxrs-2.0-api-$JAXRS_VERSION.jar
+        jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar
 
     JBOSS_LOGGING_VERSION=$(rpm -q jboss-logging | sed -n 's/^jboss-logging-\([^-]*\)-.*$/\1.Final/p')
     echo "JBOSS_LOGGING_VERSION: $JBOSS_LOGGING_VERSION"
@@ -1120,7 +1159,7 @@ then
     mkdir -p base/server/lib
     pushd base/server/lib
 
-    RESTEASY_VERSION=$(rpm -q pki-servlet-initializer | sed -n 's/^pki-servlet-initializer-\([^-]*\)-.*$/\1.Final/p')
+    RESTEASY_VERSION=$(rpm -q pki-resteasy-servlet-initializer | sed -n 's/^pki-resteasy-servlet-initializer-\([^-]*\)-.*$/\1.Final/p')
     echo "RESTEASY_VERSION: $RESTEASY_VERSION"
 
     cp /usr/share/java/resteasy/resteasy-servlet-initializer.jar \
@@ -1378,23 +1417,14 @@ pkgs=base\
 
 %if %{without runtime_deps}
 
-%if %{with base}
-echo "Installing common libraries into %{buildroot}%{_datadir}/pki/lib"
-cp base/common/lib/* %{buildroot}%{_datadir}/pki/lib
-ls -l %{buildroot}%{_datadir}/pki/lib
-%endif
-
-%if %{with server}
-echo "Installing server libraries into %{buildroot}%{_datadir}/pki/server/common/lib"
-cp base/server/lib/* %{buildroot}%{_datadir}/pki/server/common/lib
-ls -l %{buildroot}%{_datadir}/pki/server/common/lib
-%endif
-
 %if %{with maven}
 
 %if %{with meta}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='jakarta.activation']" \
+    -d "//_:dependency[_:groupId='jakarta.annotation']" \
+    -d "//_:dependency[_:groupId='jakarta.xml.bind']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
@@ -1407,6 +1437,9 @@ xmlstarlet edit --inplace \
 %if %{with base}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-java.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='jakarta.activation']" \
+    -d "//_:dependency[_:groupId='jakarta.annotation']" \
+    -d "//_:dependency[_:groupId='jakarta.xml.bind']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
@@ -1417,6 +1450,9 @@ xmlstarlet edit --inplace \
 
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-tools.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='jakarta.activation']" \
+    -d "//_:dependency[_:groupId='jakarta.annotation']" \
+    -d "//_:dependency[_:groupId='jakarta.xml.bind']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
@@ -1429,6 +1465,9 @@ xmlstarlet edit --inplace \
 %if %{with server}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-server.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='jakarta.activation']" \
+    -d "//_:dependency[_:groupId='jakarta.annotation']" \
+    -d "//_:dependency[_:groupId='jakarta.xml.bind']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
@@ -1441,6 +1480,9 @@ xmlstarlet edit --inplace \
 %if %{with ca}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-ca.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='jakarta.activation']" \
+    -d "//_:dependency[_:groupId='jakarta.annotation']" \
+    -d "//_:dependency[_:groupId='jakarta.xml.bind']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
@@ -1453,6 +1495,9 @@ xmlstarlet edit --inplace \
 %if %{with kra}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-kra.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='jakarta.activation']" \
+    -d "//_:dependency[_:groupId='jakarta.annotation']" \
+    -d "//_:dependency[_:groupId='jakarta.xml.bind']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
@@ -1465,6 +1510,9 @@ xmlstarlet edit --inplace \
 %if %{with ocsp}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-ocsp.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='jakarta.activation']" \
+    -d "//_:dependency[_:groupId='jakarta.annotation']" \
+    -d "//_:dependency[_:groupId='jakarta.xml.bind']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
@@ -1477,6 +1525,9 @@ xmlstarlet edit --inplace \
 %if %{with tks}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-tks.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='jakarta.activation']" \
+    -d "//_:dependency[_:groupId='jakarta.annotation']" \
+    -d "//_:dependency[_:groupId='jakarta.xml.bind']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
@@ -1489,6 +1540,9 @@ xmlstarlet edit --inplace \
 %if %{with tps}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-tps.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='jakarta.activation']" \
+    -d "//_:dependency[_:groupId='jakarta.annotation']" \
+    -d "//_:dependency[_:groupId='jakarta.xml.bind']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
@@ -1501,6 +1555,9 @@ xmlstarlet edit --inplace \
 %if %{with acme}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-acme.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='jakarta.activation']" \
+    -d "//_:dependency[_:groupId='jakarta.annotation']" \
+    -d "//_:dependency[_:groupId='jakarta.xml.bind']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
@@ -1513,6 +1570,9 @@ xmlstarlet edit --inplace \
 %if %{with est}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-est.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='jakarta.activation']" \
+    -d "//_:dependency[_:groupId='jakarta.annotation']" \
+    -d "//_:dependency[_:groupId='jakarta.xml.bind']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
     -d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
@@ -1991,6 +2051,10 @@ fi
 
 ################################################################################
 %changelog
+* Thu Aug 08 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.5.4-1
+- Rebase to PKI 11.5.4
+- Bundle Jakarta libraries
+
 * Tue Jul 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.5.3-1
 - Rebase to PKI 11.5.3
 - Bundle RESTEasy and Jackson libraries
diff --git a/sources b/sources
index 9a6ad23..875e7a9 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,13 @@
-SHA512 (pki-11.5.3.tar.gz) = 2572102467b2efb168ee84549d3c7ce210b159d0d30806e999c17af359ca3156401dc44dd2ec1135df590ad28315519b868d8c113c240680e3a2365d3f92edc0
+SHA512 (pki-11.5.4.tar.gz) = 0283667d87713dff335fadd15b4cebbca54ed376ec932bf20fd36b6803636d51287b93aa9666714c4a1db70233782bec68c4097b535669e3a45aefa17de1ce23
 SHA512 (jackson-annotations-2.16.1.jar) = b5f05c0aeb994c8f694cf080ffb1f8cbd3baff34f52479a618fef6c91b82c8a1cb09801ab24c898b9db698863ea7da615d8991c8741172d21d540345156a200a
 SHA512 (jackson-core-2.16.1.jar) = 3abac44446ae99aa89c4c7bb50e4a07eb297f4c8d76931e330da6830ffcd9ea94520a7dda1b8d9b00fce64e3838cc7ecf8e490eb478276155d8c286b80f5586c
 SHA512 (jackson-databind-2.16.1.jar) = adbdcfae96dcfc56669c811a6c8e99a711d372cd1950e39122fe785dfec043a62c92c4a8cf495589db10424ce10517607808cbd4d1ec184ce41c20bb96cc476c
 SHA512 (jackson-jaxrs-base-2.16.1.jar) = ed33efbd356366099807321f00a6c6b0a63492c2ccceaab47c01a5431606e2235e5063a5e03127da0667ae336159d4bef1b041edb8af8fe6842c6db2c4051b8a
 SHA512 (jackson-jaxrs-json-provider-2.16.1.jar) = 159858d45522a41573a9e2317376bb99bc536b6cc18aa0666e2364d1a8653615ced5f7381eb09c90a610ffb47f04978705138f11abe4a211ded855093ac05953
 SHA512 (jackson-module-jaxb-annotations-2.16.1.jar) = ab298afa23a4a99935d960581735d005a83dcea7a516c14263c692717b789ff8445ea7b4144d200fc58853ad705a1b947113f06df141526e194e388b9b3f9420
+SHA512 (jakarta.activation-api-2.1.2.jar) = ad77a91afab8dbbde66861ce71367abf660ac21ceee7a2b0829104ceb2add62bf48c0f688e13aedc3ab8acd1967a215ead7291057b88e26295e5f60cb5694e72
+SHA512 (jakarta.annotation-api-1.3.5.jar) = 989a0d1e993c37d00c9860026a4298c65274547b386b4f8053f914e1d614a1a4beba1d9c0dfe09b151d35b2119fea2d41be55d62551b6373830e255602eb3bfe
+SHA512 (jakarta.xml.bind-4.0.1.jar) = 4730c1129719e166488888f4b14edd0a4f180d67b6772b4f58fc24d747da48f84463b2a01437200f07806525662a77251a3ce83375886b7c83f2b0e34ef21add
 SHA512 (jboss-jaxrs-2.0-api-1.0.0.Final.jar) = 39a29f9259e7ceb9018447c49d4a18be31aa88775ed7999eff20b2a8f1d8daa25da520c09d0a1c53bf7f417106a64cb2d4f374038ae44511cb60dac1db714495
 SHA512 (jboss-logging-3.5.3.Final.jar) = 2f604d0318a9f10b5c867dbff4ac7a3a608a41a9383cb3fc2ef6364f28396144ead96a0526ae3dea4336109042ead81b9b9318b13e9964b2c57a26794981f5cb
 SHA512 (resteasy-client-3.0.26.Final.jar) = 9f3ea65f9cb045cc2e6f4c06f9b63f8d1f78b36ae419ca8367ce11cdd82e6fe35a2d5847634d71a306e0f6d8e3a69db5930c179cf635f105a8f064becb14f2a2
diff --git a/sources-download.sh b/sources-download.sh
index 396f306..f8121bf 100755
--- a/sources-download.sh
+++ b/sources-download.sh
@@ -35,6 +35,10 @@ fi
 
 OPTIONS=(-i /usr/share/qa-tools/1minutetip/1minutetip)
 
+download jakarta-activation
+download jakarta-annotations
+download jaxb-api
+
 download jackson-annotations
 download jackson-core
 download jackson-databind