diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml
index 3d5291c3a..adfe6033f 100644
--- a/.github/workflows/build-push.yaml
+++ b/.github/workflows/build-push.yaml
@@ -15,10 +15,10 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v3
 
-      - name: Install Go 1.18
+      - name: Install Go 1.19
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: 1.19
 
       - name: Generate the bundle contents
         run: make bundle
diff --git a/.github/workflows/kind-deploy.yaml b/.github/workflows/kind-deploy.yaml
index 8c5b7e045..ec4911cb9 100644
--- a/.github/workflows/kind-deploy.yaml
+++ b/.github/workflows/kind-deploy.yaml
@@ -17,10 +17,10 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v3
 
-      - name: Install Go 1.18
+      - name: Install Go 1.19
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: 1.19
 
       - name: Deploy the controller and CRDs
         run: make deploy
diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml
index c74662cdc..eaabc9399 100644
--- a/.github/workflows/tag-release.yaml
+++ b/.github/workflows/tag-release.yaml
@@ -13,10 +13,10 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v3
 
-      - name: Install Go 1.18
+      - name: Install Go 1.19
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: 1.19
 
       - name: Generate the bundle contents
         run: make bundle TAG=${{ github.ref_name }}
@@ -109,10 +109,10 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v3
 
-      - name: Install Go 1.18
+      - name: Install Go 1.19
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: 1.19
 
       - name: Generate manifests for installation by kubectl
         run: make manifests TAG=${{ github.ref_name }}
diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml
index 2e52b2fd5..b8636d9f9 100644
--- a/.github/workflows/test-build.yaml
+++ b/.github/workflows/test-build.yaml
@@ -14,10 +14,10 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v3
 
-      - name: Install Go 1.18
+      - name: Install Go 1.19
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: 1.19
 
       - name: Generate the bundle contents
         run: make bundle
diff --git a/.github/workflows/test-golang.yaml b/.github/workflows/test-golang.yaml
index 91a6793ee..2c93c60b7 100644
--- a/.github/workflows/test-golang.yaml
+++ b/.github/workflows/test-golang.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Golang
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Run "make test"
         run: make test
@@ -35,7 +35,7 @@ jobs:
       - name: Set up Golang
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Verify Go modules
         run: go mod verify
@@ -50,7 +50,7 @@ jobs:
       - name: Set up Golang
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Vendor all dependencies
         run: go mod vendor
diff --git a/Dockerfile b/Dockerfile
index 3869a8884..4cfceba30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.18 as builder
+FROM golang:1.19 as builder
 
 # Copy the contents of the repository
 ADD . /workspace/go/src/github.com/csi-addons/kubernetes-csi-addons
diff --git a/apis/csiaddons/v1alpha1/groupversion_info.go b/apis/csiaddons/v1alpha1/groupversion_info.go
index 9a9d1e33e..9bb88b2e8 100644
--- a/apis/csiaddons/v1alpha1/groupversion_info.go
+++ b/apis/csiaddons/v1alpha1/groupversion_info.go
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1alpha1 contains API Schema definitions for the csiaddons v1alpha1 API group
-//+kubebuilder:object:generate=true
-//+groupName=csiaddons.openshift.io
+// +kubebuilder:object:generate=true
+// +groupName=csiaddons.openshift.io
 package v1alpha1
 
 import (
diff --git a/apis/replication.storage/v1alpha1/groupversion_info.go b/apis/replication.storage/v1alpha1/groupversion_info.go
index c73f93afc..37182b68d 100644
--- a/apis/replication.storage/v1alpha1/groupversion_info.go
+++ b/apis/replication.storage/v1alpha1/groupversion_info.go
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1alpha1 contains API Schema definitions for the replication.storage v1alpha1 API group
-//+kubebuilder:object:generate=true
-//+groupName=replication.storage.openshift.io
+// +kubebuilder:object:generate=true
+// +groupName=replication.storage.openshift.io
 package v1alpha1
 
 import (
diff --git a/build/Containerfile.sidecar b/build/Containerfile.sidecar
index 7e3c979df..a9b8c584e 100644
--- a/build/Containerfile.sidecar
+++ b/build/Containerfile.sidecar
@@ -1,5 +1,5 @@
 # Build the sidecar binary
-FROM golang:1.18 as builder
+FROM golang:1.19 as builder
 
 # Copy the contents of the repository
 ADD . /workspace/go/src/github.com/csi-addons/kubernetes-csi-addons
diff --git a/sidecar/internal/util/util.go b/sidecar/internal/util/util.go
index 1db9f6932..a3d1bfae8 100644
--- a/sidecar/internal/util/util.go
+++ b/sidecar/internal/util/util.go
@@ -49,9 +49,9 @@ func ValidateControllerEndpoint(rawIP, rawPort string) (string, error) {
 // sidecar running.
 // The format of the URL depends on the arguments passed to this function, it
 // will return either
-//  - a ValidateControllerEndpoint() if rawIP is set
-//  - pod://<pod>:<port> if pod is set, and rawIP and namespace are not set
-//  - pod://<pod>.<namespace>:<port> if pod, namespace are set, and rawIP not
+//   - a ValidateControllerEndpoint() if rawIP is set
+//   - pod://<pod>:<port> if pod is set, and rawIP and namespace are not set
+//   - pod://<pod>.<namespace>:<port> if pod, namespace are set, and rawIP not
 func BuildEndpointURL(rawIP, rawPort, pod, namespace string) (string, error) {
 	if rawIP != "" {
 		return ValidateControllerEndpoint(rawIP, rawPort)