diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6a663eb8c63b..4ce8df0ac26b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ on:
 jobs:
 
   cstor:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: true
       matrix:
diff --git a/buildscripts/install-build-dep.sh b/buildscripts/install-build-dep.sh
index 5a728f4290a0..dfeaa1bcc7ea 100755
--- a/buildscripts/install-build-dep.sh
+++ b/buildscripts/install-build-dep.sh
@@ -52,7 +52,7 @@ make -j4
 cd ..
 
 # clone and build SPL
-git clone https://github.com/${LCSTOR_ORG}/spl
+git clone https://github.com/pawanpraka1/spl
 cd spl || exit 1
 git checkout spl-0.7.9
 sh autogen.sh
diff --git a/buildscripts/install-tool-dep.sh b/buildscripts/install-tool-dep.sh
index f5a4e048c9f5..7b45b393ebd4 100755
--- a/buildscripts/install-tool-dep.sh
+++ b/buildscripts/install-tool-dep.sh
@@ -4,7 +4,7 @@
 ARCH=$(uname -p)
 
 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
@@ -17,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++
-