diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 62a5baa8207b..4ce8df0ac26b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ on:
 jobs:
 
   cstor:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: true
       matrix:
@@ -34,9 +34,9 @@ jobs:
       - name: Set Branch
         run: |
           BRANCH="${GITHUB_REF##*/}"
-          REPO_ORG=${{ github.repository_owner }}
+          LCSTOR_ORG=openebs
           echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
-          echo "REPO_ORG=${REPO_ORG}" >> $GITHUB_ENV
+          echo "LCSTOR_ORG=${LCSTOR_ORG}" >> $GITHUB_ENV
 
       - name: Install Tool dependencies
         run: buildscripts/install-tool-dep.sh
diff --git a/buildscripts/install-build-dep.sh b/buildscripts/install-build-dep.sh
index f7bd5d05b1c1..dfeaa1bcc7ea 100755
--- a/buildscripts/install-build-dep.sh
+++ b/buildscripts/install-build-dep.sh
@@ -1,17 +1,18 @@
 #!/bin/bash
 
 # Mandatory variables
-# $REPO_ORG organisation from which to clone the dependent repositories
+# $LCSTOR_ORG organisation from which to clone the dependent repositories
 # $BRANCH to be used for building
 #
 # Optional variables
 # $UZFS_BUILD variable need to be set. If not kernel mode zfs will be built
 
-if [ -z "${REPO_ORG}" ]; then
-  echo "REPO_ORG variable not set. Required for fetching dependent build repositories"
+
+if [ -z "${LCSTOR_ORG}" ]; then
+  echo "LCSTOR_ORG variable not set. Required for fetching dependent build repositories"
   exit 1
 else
-  echo "Using repository organization: ${REPO_ORG}"
+  echo "Using repository organization: ${LCSTOR_ORG}"
 fi
 
 if [ -z "${BRANCH}" ]; then
@@ -51,7 +52,7 @@ make -j4
 cd ..
 
 # clone and build SPL
-git clone https://github.com/${REPO_ORG}/spl
+git clone https://github.com/pawanpraka1/spl
 cd spl || exit 1
 git checkout spl-0.7.9
 sh autogen.sh
@@ -67,7 +68,7 @@ fi
 cd ..
 
 # Build libcstor for uzfs feature
-git clone https://github.com/${REPO_ORG}/libcstor.git
+git clone https://github.com/${LCSTOR_ORG}/libcstor.git
 cd libcstor || exit 1
 if [ "${BRANCH}" == "develop" ]; then
   git checkout develop
diff --git a/buildscripts/install-tool-dep.sh b/buildscripts/install-tool-dep.sh
index 973e34a589a5..7b45b393ebd4 100755
--- a/buildscripts/install-tool-dep.sh
+++ b/buildscripts/install-tool-dep.sh
@@ -3,9 +3,8 @@
 # get the machine architecture
 ARCH=$(uname -p)
 
-sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 sudo apt-get update -qq
-sudo apt-get install --yes -qq gcc-6 g++-6
+sudo apt-get install --yes -qq gcc g++
 sudo apt-get install --yes -qq build-essential autoconf libtool gawk alien fakeroot libaio-dev jq
 sudo apt-get install --yes -qq linux-headers-$(uname -r);
 sudo apt-get install --yes -qq zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libssl-dev libjson-c-dev
@@ -18,11 +17,3 @@ if [ "$ARCH" == "x86_64" ]; then
 fi
 
 sudo apt-get install --yes -qq libgtest-dev cmake
-
-# packages for debugging
-sudo apt-get install gdb
-
-# use gcc-6 by default
-sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-6 /usr/bin/gcc
-sudo unlink /usr/bin/g++ && sudo ln -s /usr/bin/g++-6 /usr/bin/g++
-