diff --git a/addons/dev-helpers/create-pf-git-storage.sh b/addons/dev-helpers/create-pf-git-storage.sh
index 531647eebd11..d3d6e2ea4fc9 100644
--- a/addons/dev-helpers/create-pf-git-storage.sh
+++ b/addons/dev-helpers/create-pf-git-storage.sh
@@ -14,7 +14,6 @@ function exit_usage() {
 
 dst_dir="$1"
 pf_ref="$2"
-fb_ref="$3"
 
 if [ -z "$dst_dir" ]; then
   echo "!!! - Missing destination directory"
@@ -26,17 +25,11 @@ if [ -z "$pf_ref" ]; then
   exit_usage
 fi
 
-if [ -z "$fb_ref" ]; then
-  echo "!!! - Missing Fingerbank perl client repo branch or tag name"
-  exit_usage
-fi
-
 mkdir -p $dst_dir
 
 tmpdir=`mktemp -d`
 
 git clone -b $pf_ref https://github.com/inverse-inc/packetfence $tmpdir/packetfence
-git clone -b $fb_ref https://github.com/fingerbank/perl-client $tmpdir/fingerbank
 
 ## Happens in the PF dir (chdir)
 cd $tmpdir/packetfence
@@ -62,7 +55,7 @@ EOF
 cd -
 ## End of the commands in the PF dir
 
-cd $tmpdir/fingerbank
+cd  $tmpdir/packetfence/addons/perl-client/
 perl db/upgrade.pl --database=db/fingerbank_Local.db
 cp db/fingerbank_Local.db db/fingerbank_Upstream.db
 cd -
@@ -74,10 +67,9 @@ mkdir -p $dst_dir/html/captive-portal/profile-templates/
 touch $dst_dir/html/captive-portal/profile-templates/.empty
 
 mkdir -p $dst_dir/fingerbank
-cp -a $tmpdir/fingerbank/conf $dst_dir/fingerbank/
+cp -a $tmpdir/packetfence/addons/perl-client/conf  $dst_dir/fingerbank/
 touch $dst_dir/fingerbank/conf/fingerbank.conf
 
 find $dst_dir -name .gitignore -delete
 
 chmod a+r -R $dst_dir
-
diff --git a/addons/dev-helpers/update-pf-git-storage.sh b/addons/dev-helpers/update-pf-git-storage.sh
index 9dab30c23c56..2ce539a195f0 100644
--- a/addons/dev-helpers/update-pf-git-storage.sh
+++ b/addons/dev-helpers/update-pf-git-storage.sh
@@ -14,7 +14,6 @@ function exit_usage() {
 
 dst_dir="$1"
 pf_ref="$2"
-fb_ref="$3"
 
 if [ -z "$dst_dir" ] || ! [ -d "$dst_dir" ]; then
   echo "!!! - Missing destination directory or it doesn't exist"
@@ -26,17 +25,11 @@ if [ -z "$pf_ref" ]; then
   exit_usage
 fi
 
-if [ -z "$fb_ref" ]; then
-  echo "!!! - Missing Fingerbank perl client repo branch or tag name"
-  exit_usage
-fi
-
 dst_dir=`echo $dst_dir | sed 's|/$||'`
 
 tmpdir=`mktemp -d`
 
 git clone -b $pf_ref https://github.com/inverse-inc/packetfence $tmpdir/packetfence
-git clone -b $fb_ref https://github.com/fingerbank/perl-client $tmpdir/fingerbank
 
 cd $tmpdir/packetfence
 make configurations
@@ -67,7 +60,7 @@ ln -s ../sites-available/dynamic-clients dynamic-clients
 cd -
 
 mkdir -p $dst_dir/fingerbank
-cp -a $tmpdir/fingerbank/conf $dst_dir/fingerbank/
+cp -a $tmpdir/packetfence/addons/perl-client/conf $dst_dir/fingerbank/
 
 for file in $files; do
   file=`echo $file | sed 's|^/usr/local/pf/||'`