diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index a6cd5690d4..155606f139 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Set up Go ${{ matrix.go }}
         uses: actions/setup-go@v5
         with:
-          go-version: '^1.13.1'
+          go-version: ${{ matrix.go }}
 
       - name: Install shared software dependencies
         uses: ./.github/workflows/install-shared-dependencies
@@ -143,13 +143,10 @@ jobs:
           export GOPATH=$HOME/go
           export PATH=$PATH:$GOPATH/bin
 
-      - name: Build rust part
-        working-directory: go
-        run: cargo build --release
-
-      - name: Build go part
-        working-directory: go
+      - name: Build client
+        working-directory: ./go
         run: |
+          cargo build --release
           go mod edit -go=${{ matrix.go }}
           make build
 
diff --git a/go/.gitignore b/go/.gitignore
index 0a23fe9d26..d96f8200c9 100644
--- a/go/.gitignore
+++ b/go/.gitignore
@@ -2,4 +2,4 @@
 lib.h
 *.pb.go
 
-reports
\ No newline at end of file
+reports
diff --git a/go/Makefile b/go/Makefile
index 78c63cb1c3..8368275948 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -15,12 +15,12 @@ build-glide-client:
 generate-protobuf:
 	mkdir -p protobuf
 	protoc --proto_path=../glide-core/src/protobuf \
-      	--go_opt=Mconnection_request.proto=github.com/aws/glide-for-redis/go/protobuf \
-      	--go_opt=Mredis_request.proto=github.com/aws/glide-for-redis/go/protobuf \
-      	--go_opt=Mresponse.proto=github.com/aws/glide-for-redis/go/protobuf \
-      	--go_out=./protobuf \
-      	--go_opt=paths=source_relative \
-      	../glide-core/src/protobuf/*.proto
+		--go_opt=Mconnection_request.proto=github.com/aws/glide-for-redis/go/protobuf \
+		--go_opt=Mredis_request.proto=github.com/aws/glide-for-redis/go/protobuf \
+		--go_opt=Mresponse.proto=github.com/aws/glide-for-redis/go/protobuf \
+		--go_out=./protobuf \
+		--go_opt=paths=source_relative \
+		../glide-core/src/protobuf/*.proto
 
 lint:
 	go vet ./...
diff --git a/go/glide.go b/go/glide.go
index 107b0ee821..767864d035 100644
--- a/go/glide.go
+++ b/go/glide.go
@@ -1 +1 @@
-package _go
+package glide