diff --git a/.gitignore b/.gitignore
index bb1d497..ba2f040 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /v6.3.0.tar.gz
 /v6.3.1.tar.gz
 /v6.3.2.tar.gz
+/v6.4.0.tar.gz
diff --git a/keylime.spec b/keylime.spec
index f56d4b2..8d05ce6 100644
--- a/keylime.spec
+++ b/keylime.spec
@@ -1,7 +1,7 @@
 %global srcname keylime
 
 Name:    keylime
-Version: 6.3.2
+Version: 6.4.0
 Release: 1%{?dist}
 Summary: Open source TPM software for Bootstrapping and Maintaining Trust
 
@@ -93,6 +93,7 @@ Requires: python3-packaging
 Requires: python3-requests
 Requires: python3-zmq
 Requires: python3-gnupg
+Requires: python3-lark-parser
 
 
 %description verifier
@@ -118,6 +119,7 @@ Requires: python3-packaging
 Requires: python3-requests
 Requires: python3-zmq
 Requires: python3-gnupg
+Requires: python3-lark-parser
 
 
 %description registrar
@@ -146,6 +148,7 @@ Requires: python3-packaging
 Requires: python3-requests
 Requires: python3-zmq
 Requires: python3-gnupg
+Requires: python3-lark-parser
 
 
 %description -n python3-%{srcname}-agent
@@ -254,37 +257,16 @@ getent passwd %{srcname} >/dev/null || \
 if getent group tss >/dev/null && ! groups %{srcname} | grep -q "\btss\b"; then
     usermod -a -G tss %{srcname} &>/dev/null
 fi
-
-# Check if already use run_as (introduced in 6.3.2).
-if ! _ug=$(grep ^run_as %{_sysconfdir}/%{srcname}.conf | awk '{ print $3 }') \
-           || [ -z "${_ug}" ]; then
-
-    [ -d %{_localstatedir}/lib/rpm-state/%{srcname} ] \
-        && rm -rf %{_localstatedir}/lib/rpm-state/%{srcname}
-    mkdir -p %{_localstatedir}/lib/rpm-state/%{srcname}
-    touch %{_localstatedir}/lib/rpm-state/%{srcname}/no-run_as
-fi
 exit 0
 
 %posttrans base
 [ -f %{_sysconfdir}/%{srcname}.conf ] && \
-    chmod 600 %{_sysconfdir}/%{srcname}.conf
-
-# If we just started using run_as, we need to change a few permissions.
-if _ug=$(grep ^run_as %{_sysconfdir}/%{srcname}.conf | awk '{ print $3 }') \
-         && [ -n "${_ug}" ] \
-         && [ -f %{_localstatedir}/lib/rpm-state/%{srcname}/no-run_as ]; then
-
-    [ -f %{_sharedstatedir}/%{srcname}/tpmdata.yml ] && \
-        chown "${_ug}" %{_sharedstatedir}/%{srcname}/tpmdata.yml
-    if [ -d %{_sharedstatedir}/%{srcname}/cv_ca ]; then
-        chown "${_ug}" %{_sharedstatedir}/%{srcname}/cv_ca
-        [ -f %{_sharedstatedir}/%{srcname}/cv_ca/cacert.crt ] && \
-            chown "${_ug}" %{_sharedstatedir}/%{srcname}/cv_ca/cacert.crt
-    fi
-fi
-[ -d %{_localstatedir}/lib/rpm-state/%{srcname} ] \
-    && rm -rf %{_localstatedir}/lib/rpm-state/%{srcname}
+    chmod 600 %{_sysconfdir}/%{srcname}.conf && \
+    chown %{srcname} %{_sysconfdir}/%{srcname}.conf
+[ -d %{_sharedstatedir}/%{srcname} ] && \
+    chown -R %{srcname} %{_sharedstatedir}/%{srcname}/
+[ -d %{_localstatedir}/log/%{srcname} ] && \
+    chown -R %{srcname} %{_localstatedir}/log/%{srcname}/
 exit 0
 
 %post verifier
@@ -362,6 +344,9 @@ exit 0
 %license LICENSE
 
 %changelog
+* Wed May 04 2022 Sergio Correia <scorreia@redhat.com> - 6.4.0-1
+- Updating for Keylime release v6.4.0
+
 * Wed Apr 06 2022 Sergio Correia <scorreia@redhat.com> - 6.3.2-1
 - Updating for Keylime release v6.3.2
 
diff --git a/sources b/sources
index 2217a26..6e0561b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v6.3.2.tar.gz) = 632c2acccc5e139c2771e6771eca497933b2d76fa1307c97a72aa507a113342b9a6fd2c7fec288a9cdc90a1fce7d7febd453c97f859ea4a248f8171fd39fd4b1
+SHA512 (v6.4.0.tar.gz) = a6e14984c6090ca796cd3dbe0b40660fd29c7587d19e093a6686d8f7b100b7de4362a7a914958a109f09083cd9355baf2f760b3b5631969d1269ab0171463f93