diff --git a/Pipfile b/Pipfile
index a2cec42c..23bb1582 100644
--- a/Pipfile
+++ b/Pipfile
@@ -28,7 +28,7 @@ pylibyaml = "~=0.1"
 PyYAML = "~=5.1"
 deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "d7d3cbde2bd44eed0d574ec439d1f8194dbcf782"}
 shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "35e5a7f796a5341e02fb0d3f2d27b41e2fb39131",subdirectory = "src/bin/shipyard_client"}
-promenade = {git = "https://opendev.org/airship/promenade.git",ref = "bc14e9bbb9857becedd7ce9d6b81d74de77b497b"}
+promenade = {git = "https://opendev.org/airship/promenade.git",ref = "53d0ecb7f959050ebb75ab7420ca5bc07428aacb"}
 "oslo.i18n" = "~=3.24.0"
 "oslo.utils" = ">=3.42.1"
 six = ">=1.15.0"
diff --git a/Pipfile.lock b/Pipfile.lock
index 65c170c7..a2fd661f 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -722,7 +722,7 @@
         },
         "promenade": {
             "git": "https://opendev.org/airship/promenade.git",
-            "ref": "bc14e9bbb9857becedd7ce9d6b81d74de77b497b"
+            "ref": "53d0ecb7f959050ebb75ab7420ca5bc07428aacb"
         },
         "psycopg2-binary": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index 0b498b17..a4a8120c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,7 +28,7 @@ fixtures==3.0.0
 flake8==3.7.9
 futurist==2.2.0; python_version >= '3.6'
 git+https://opendev.org/airship/deckhand.git@d7d3cbde2bd44eed0d574ec439d1f8194dbcf782#egg=deckhand
-git+https://opendev.org/airship/promenade.git@bc14e9bbb9857becedd7ce9d6b81d74de77b497b#egg=promenade
+git+https://opendev.org/airship/promenade.git@53d0ecb7f959050ebb75ab7420ca5bc07428aacb#egg=promenade
 git+https://opendev.org/airship/shipyard.git@35e5a7f796a5341e02fb0d3f2d27b41e2fb39131#egg=shipyard-client&subdirectory=src/bin/shipyard_client
 gitdb2==2.0.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 gitpython==2.1.15
diff --git a/tox.ini b/tox.ini
index 0d08e006..4bdc83e4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,7 @@ setenv =
   PIPENV_IGNORE_PIPFILE=1
 deps =
   pipenv
+  setuptools < 58.0.0
 passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
 whitelist_externals =
   bash
@@ -27,6 +28,7 @@ commands =
 basepython = python3
 deps =
   pipenv
+  setuptools < 58.0.0
 commands =
   pipenv install --dev
   yapf -ir {toxinidir}/pegleg {toxinidir}/tests
@@ -35,6 +37,7 @@ commands =
 basepython = python3
 deps =
   pipenv
+  setuptools < 58.0.0
   safety
 commands =
   pipenv install --dev
@@ -49,6 +52,7 @@ whitelist_externals =
 basepython = python3
 deps =
   pipenv
+  setuptools < 58.0.0
   -r{toxinidir}/doc/requirements.txt
 commands =
   pipenv install --dev
@@ -64,6 +68,7 @@ commands = bandit -r pegleg -n 5
 basepython = python3
 deps =
   pipenv
+  setuptools < 58.0.0
   safety
 commands =
   pipenv check
@@ -73,6 +78,7 @@ commands =
 basepython = python3
 deps =
   pipenv
+  setuptools < 58.0.0
 commands =
   pipenv install --dev
   {toxinidir}/tools/install-cfssl.sh
@@ -84,7 +90,8 @@ whitelist_externals =
 
 [testenv:update-requirements]
 deps =
-    pipenv
+  pipenv
+  setuptools < 58.0.0
 commands =
   pipenv lock --clear
   bash -c "pipenv lock -r > {toxinidir}/requirements.txt"
diff --git a/vcs-requirements.env b/vcs-requirements.env
index 4a5c6d21..dae92899 100644
--- a/vcs-requirements.env
+++ b/vcs-requirements.env
@@ -1,3 +1,3 @@
 DECKHAND_VERSION=commit/d7d3cbde2bd44eed0d574ec439d1f8194dbcf782
 SHIPYARD_VERSION=commit/35e5a7f796a5341e02fb0d3f2d27b41e2fb39131
-PROMENADE_VERSION=commit/bc14e9bbb9857becedd7ce9d6b81d74de77b497b
+PROMENADE_VERSION=commit/53d0ecb7f959050ebb75ab7420ca5bc07428aacb