diff --git a/bin/pandachi-install b/bin/pandachi-install
index 7bef22f..e2253a4 100755
--- a/bin/pandachi-install
+++ b/bin/pandachi-install
@@ -16,6 +16,13 @@ if ! [ -d "/opt/apps/pandachi-deploy" ]; then
     git clone git.0k.io:/var/git/0k/pandachi-deploy.git
 fi
 
+if ! [ -d "/opt/apps/pandachi-manage" ]; then
+    mkdir -p /opt/apps && cd /opt/apps
+    git clone git.0k.io:/var/git/0k/pandachi-manage.git
+fi
+
+ln -sfn /opt/apps/pandachi-manage/bin/* /usr/local/bin/
+
 #[ -e /etc/compose.conf ] || ln -sfv /opt/apps/pandachi-deploy/etc/compose.conf /etc/compose.conf
 
 ## XXXvlab: should get rid of this file in some future
diff --git a/bin/pandachi-update b/bin/pandachi-update
index 30be7ed..4dc40de 100755
--- a/bin/pandachi-update
+++ b/bin/pandachi-update
@@ -14,7 +14,24 @@ EOF
 
 charm --debug apply docker-host
 
+
+Wrap -d "Update pandachi-manage" <<EOF || exit 1
+if ! [ -d "/opt/apps/pandachi-manage" ]; then
+    mkdir -p /opt/apps && cd /opt/apps
+    git clone git.0k.io:/var/git/0k/pandachi-manage.git
+else
+    cd /opt/apps/pandachi-manage &&
+    git checkout master &&
+    git pull -r
+fi
+
+ln -sfn /opt/apps/pandachi-manage/bin/* /usr/local/sbin/
+find -L /usr/local/sbin -maxdepth 1 -type l -ilname /opt/apps/pandachi-manage/bin/\* -delete
+EOF
+
+
 ## there seem to be an error now within compose when trying to download let's encrypt image.
 Wrap -d "Updating some docker images" <<EOF || exit 1
 docker pull docker.0k.io/letsencrypt
 EOF
+