diff --git a/buildspecs/build.yml b/buildspecs/build-artifacts.yml
similarity index 82%
rename from buildspecs/build.yml
rename to buildspecs/build-artifacts.yml
index 6c70f9f70b4..ccb8acab60b 100644
--- a/buildspecs/build.yml
+++ b/buildspecs/build-artifacts.yml
@@ -3,7 +3,7 @@ version: 0.2
 env:
   variables:
     # Github username of the forked repo on which to make builds
-    GITHUBUSERNAME: aws
+    GITHUBUSERNAME: prateekchaudhry
  
 phases:
   install:
@@ -19,13 +19,18 @@ phases:
            ;;
          esac
 
+       - echo $GOROOT
+       - echo $GOPATH
+       - echo $GOBIN
+       - which go
+       - goenv install --list
        - GOVERSION="$(cat GO_VERSION)"
+       - GOVERSION="1.15.5"
        - BUILD_LOG="build_${architecture}.log"
-       - GOLANG_TAR="go${GOVERSION}.linux-${architecture}.tar.gz"
 
-       # Need to install GOLANG explicitly as required versions do not come preinstalled
-       - wget -O /tmp/${GOLANG_TAR} https://storage.googleapis.com/golang/${GOLANG_TAR} 2>&1 | tee $BUILD_LOG
-       - tar -C /usr/local -xzf /tmp/${GOLANG_TAR} 2>&1 | tee -a $BUILD_LOG
+       # Install the correct version of GoLang using goenv utility (preinstalled in CodeBuild images)
+       - goenv install $GOVERSION
+       - goenv local $GOVERSION
        - go version
 
        # glibc-static required for dockerfree make method