diff --git a/devstack/README.rst b/devstack/README.rst
index 8f5c17497..42c38c410 100644
--- a/devstack/README.rst
+++ b/devstack/README.rst
@@ -16,6 +16,10 @@ zun plugin::
      enable_plugin zun https://git.openstack.org/openstack/zun master
      END
 
+If you would like to install python-zunclient from git, add to local.conf::
+
+     LIBS_FROM_GIT="python-zunclient"
+
 Then run devstack normally::
 
     cd /opt/stack/devstack
diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample
index 4d102c134..07491557b 100644
--- a/devstack/local.conf.sample
+++ b/devstack/local.conf.sample
@@ -10,5 +10,8 @@ enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devs
 KURYR_ETCD_PORT=2379
 enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
 
+# install python-zunclient from git
+LIBS_FROM_GIT="python-zunclient"
+
 # Optional:  uncomment to enable the Zun UI plugin in Horizon
 # enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index acae9d6bd..f75616ed7 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -13,7 +13,6 @@ if is_service_enabled zun-api zun-compute; then
         echo_summary "Installing zun"
         install_zun
 
-        LIBS_FROM_GIT="${LIBS_FROM_GIT},python-zunclient"
         install_zunclient
         cleanup_zun
 
diff --git a/doc/source/contributor/quickstart.rst b/doc/source/contributor/quickstart.rst
index 010f65e86..2e054ada9 100644
--- a/doc/source/contributor/quickstart.rst
+++ b/doc/source/contributor/quickstart.rst
@@ -40,6 +40,9 @@ required OpenStack services::
     enable_plugin zun https://git.openstack.org/openstack/zun
     enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
 
+    # install python-zunclient from git
+    LIBS_FROM_GIT="python-zunclient"
+
     # Optional:  uncomment to enable the Zun UI plugin in Horizon
     # enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui
     END
diff --git a/playbooks/zun-devstack-base-multinode/run.yaml b/playbooks/zun-devstack-base-multinode/run.yaml
index e5924c3d5..987930e50 100644
--- a/playbooks/zun-devstack-base-multinode/run.yaml
+++ b/playbooks/zun-devstack-base-multinode/run.yaml
@@ -30,6 +30,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin zun git://git.openstack.org/openstack/zun
+          LIBS_FROM_GIT="python-zunclient"
 
           [[post-config|$KURYR_CONFIG]]
           [DEFAULT]
diff --git a/playbooks/zun-devstack-base/run.yaml b/playbooks/zun-devstack-base/run.yaml
index c6dd92b86..5b39b8e3e 100644
--- a/playbooks/zun-devstack-base/run.yaml
+++ b/playbooks/zun-devstack-base/run.yaml
@@ -30,6 +30,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin zun git://git.openstack.org/openstack/zun
+          LIBS_FROM_GIT="python-zunclient"
 
           EOF
         executable: /bin/bash