diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34bafd2e..3be24bae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
 
-      - name: Set up Go 1.20
+      - name: Set up Go 1.21
         uses: actions/setup-go@v1
         with:
-          go-version: '1.20'
+          go-version: '1.21'
         id: go
 
       - uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index d4527401..969eb5ca 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ TAG              := $(VERSION)_$(OS)_$(ARCH)
 TAG_PROD         := $(TAG)
 TAG_DBG          := $(VERSION)-dbg_$(OS)_$(ARCH)
 
-GO_VERSION       ?= 1.20
+GO_VERSION       ?= 1.21
 BUILD_IMAGE      ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
 CHART_TEST_IMAGE ?= quay.io/helmpack/chart-testing:v3.5.1
 
diff --git a/apis/apps/v1alpha1/sidekick_types.go b/apis/apps/v1alpha1/sidekick_types.go
index 149628fe..a9fe6cbe 100644
--- a/apis/apps/v1alpha1/sidekick_types.go
+++ b/apis/apps/v1alpha1/sidekick_types.go
@@ -318,7 +318,7 @@ type SidekickSpec struct {
 	// +optional
 	// +patchMergeKey=name
 	// +patchStrategy=merge,retainKeys
-	Volumes []core.Volume `json:"volumes,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name" protobuf:"bytes,1,rep,name=volumes"`
+	Volumes []core.Volume `json:"volumes,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name"`
 }
 
 // A single application container that you want to run within a pod.