diff --git a/elements/enable-packages-install/README.md b/elements/enable-packages-install/README.md
index 69b1d7506..d5a63bc59 100644
--- a/elements/enable-packages-install/README.md
+++ b/elements/enable-packages-install/README.md
@@ -17,6 +17,7 @@ This element will set the install types to package for the following elements:
     - python_neutronclient
     - python_novaclient
     - python_swiftclient
+    - python_tuskarclient
     - python_ceilometerclient
     - python_ironicclient
     - os_collect_config
diff --git a/elements/enable-packages-install/environment.d/01-export-install-types.bash b/elements/enable-packages-install/environment.d/01-export-install-types.bash
index 804cbba07..af7e3d53d 100644
--- a/elements/enable-packages-install/environment.d/01-export-install-types.bash
+++ b/elements/enable-packages-install/environment.d/01-export-install-types.bash
@@ -15,6 +15,7 @@ export DIB_INSTALLTYPE_python_keystoneclient=package
 export DIB_INSTALLTYPE_python_neutronclient=package
 export DIB_INSTALLTYPE_python_novaclient=package
 export DIB_INSTALLTYPE_python_swiftclient=package
+export DIB_INSTALLTYPE_python_tuskarclient=package
 export DIB_INSTALLTYPE_python_ceilometerclient=package
 export DIB_INSTALLTYPE_python_ironicclient=package
 
diff --git a/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash b/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash
index 8022453d8..1d958b3b2 100755
--- a/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash
+++ b/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash
@@ -73,6 +73,14 @@ if [ -z "${SWIFTCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then
     export SWIFTCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""}
 fi
 
+# tuskarclient
+if [ -z "${TUSKARCLIENT_VENV_DIR:-}" ]; then
+    export TUSKARCLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-tuskarclient"}
+fi
+if [ -z "${TUSKARCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then
+    export TUSKARCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""}
+fi
+
 # openstackclient
 if [ -z "${OPENSTACKCLIENT_VENV_DIR:-}" ]; then
     export OPENSTACKCLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-openstackclient"}
diff --git a/elements/openstack-clients/install.d/python-tuskarclient-package-install/51-tuskarclient b/elements/openstack-clients/install.d/python-tuskarclient-package-install/51-tuskarclient
new file mode 100755
index 000000000..e81749c07
--- /dev/null
+++ b/elements/openstack-clients/install.d/python-tuskarclient-package-install/51-tuskarclient
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -eux
+
+install-packages python-tuskarclient
diff --git a/elements/openstack-clients/install.d/python-tuskarclient-source-install/51-tuskarclient b/elements/openstack-clients/install.d/python-tuskarclient-source-install/51-tuskarclient
new file mode 100644
index 000000000..b1c09c291
--- /dev/null
+++ b/elements/openstack-clients/install.d/python-tuskarclient-source-install/51-tuskarclient
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -eux
+
+install-openstack-client $TUSKARCLIENT_EXTRA_INSTALL_OPTS -c tuskar -i $TUSKARCLIENT_VENV_DIR
+
+add-selinux-path-substitution /usr/bin "$TUSKARCLIENT_VENV_DIR/bin"
diff --git a/elements/openstack-clients/source-repository-clients b/elements/openstack-clients/source-repository-clients
index 7d4262df2..1b8e1c140 100644
--- a/elements/openstack-clients/source-repository-clients
+++ b/elements/openstack-clients/source-repository-clients
@@ -8,3 +8,4 @@ python-neutronclient git /opt/stack/python-neutronclient https://git.openstack.o
 python-novaclient git /opt/stack/python-novaclient https://git.openstack.org/openstack/python-novaclient.git
 python-swiftclient git /opt/stack/python-swiftclient https://git.openstack.org/openstack/python-swiftclient.git
 python-openstackclient git /opt/stack/python-openstackclient https://git.openstack.org/openstack/python-openstackclient.git
+python-tuskarclient git /opt/stack/python-tuskarclient https://git.openstack.org/openstack/python-tuskarclient.git