diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py
index 0960a5b502..8ac6838f85 100644
--- a/deploy-guide/source/conf.py
+++ b/deploy-guide/source/conf.py
@@ -26,7 +26,6 @@ import os
 import sys
 import subprocess
 
-import pbr.version
 import openstackdocstheme
 
 # -- OpenStack-Ansible configuration --------------------------------------
@@ -52,7 +51,7 @@ if current_series == "latest":
   suse_series = previous_series_name.capitalize()
 else:
   series_names = current_series.capitalize()
-  latest_tag = pbr.version.VersionInfo('osa_toolkit').__str__()
+  latest_tag = subprocess.check_output(["git", "describe", "--abbrev=0", "--tag"]).strip().decode()
   rdo_series = current_series_name
   suse_series = current_series_name.capitalize()
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a6565b9ea4..db8be3fb8b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -29,7 +29,6 @@ import sys
 import subprocess
 
 import openstackdocstheme
-import pbr.version
 import yaml
 
 # -- OpenStack-Ansible configuration --------------------------------------
@@ -55,7 +54,7 @@ if current_series == "latest":
   upgrade_warning = "Upgrading to master is not recommended. Master is under heavy development, and is not stable."
 else:
   series_names = current_series.capitalize()
-  latest_tag = pbr.version.VersionInfo('osa_toolkit').__str__()
+  latest_tag = subprocess.check_output(["git", "describe", "--abbrev=0", "--tag"]).strip().decode()
   branch = "stable/{}".format(current_series)
   upgrade_warning = "The upgrade is always under active development."