diff --git a/build_scripts/build-fsal/build-fsal_gpf.sh b/build_scripts/build-fsal/build-fsal_gpfs.sh
similarity index 100%
rename from build_scripts/build-fsal/build-fsal_gpf.sh
rename to build_scripts/build-fsal/build-fsal_gpfs.sh
diff --git a/jobs/fsal_template.yml b/jobs/fsal_template.yml
index e3f43d47..5d41687b 100644
--- a/jobs/fsal_template.yml
+++ b/jobs/fsal_template.yml
@@ -4,6 +4,7 @@
       - cephfs
       - gluster
       - rgw
+      - gpfs
 
     jobs:
       - '{name}-{product}'
diff --git a/jobs/scripts/fsal-build.sh b/jobs/scripts/fsal-build.sh
index de5a3480..9cc5898e 100644
--- a/jobs/scripts/fsal-build.sh
+++ b/jobs/scripts/fsal-build.sh
@@ -5,7 +5,7 @@ set +x
 set +e
 
 # run the bootstrap script
-bash $WORKSPACE/ci-tests/build_scripts/build-fsal/bootstrap.sh
+bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh
 RET=$?
 
 # we accept different return values