diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 7da6f5e4..a5173c2e 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@master
       with:
-        go-version: 1.19.1
+        go-version: 1.21
     - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build .
   docker:
     name: Docker build and push
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aee7c1c2..033ab24e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/setup-go@master
         with:
-          go-version: 1.19
+          go-version: 1.21
       - uses: actions/checkout@master
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
@@ -45,7 +45,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@master
         with:
-          go-version: '1.19'
+          go-version: '1.21'
       - run: GOPROXY=direct,https://proxy.golang.org GOSUMDB=off GO111MODULE=on go install -mod=mod github.com/kisielk/errcheck; /home/runner/go/bin/errcheck -tags draft ./...
   error_code_check:
     name: Error code utility check
@@ -58,7 +58,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.19
+          go-version: 1.21
       - run: |
             errWillHave="level=error"
             GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/layer5io/meshkit/cmd/errorutil;
@@ -80,7 +80,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.19
+          go-version: 1.21
       - uses: dominikh/staticcheck-action@v1.2.0
         with:
           install-go: false
@@ -96,7 +96,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@master
         with:
-          go-version: '1.19'
+          go-version: '1.21'
       - run: GOPROXY=direct,https://proxy.golang.org GOSUMDB=off GO111MODULE=on go vet -tags draft ./...
   sec_check:
     name: Security check
@@ -126,7 +126,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@master
        with:
-        go-version: '1.19'
+        go-version: '1.21'
      - name: Create cluster using KinD
        uses: engineerd/setup-kind@v0.5.0
        with:
diff --git a/.github/workflows/components-to-doc.yml b/.github/workflows/components-to-doc.yml
index 6cc1f0ff..c578a85d 100644
--- a/.github/workflows/components-to-doc.yml
+++ b/.github/workflows/components-to-doc.yml
@@ -10,7 +10,7 @@ jobs:
   CopyComponents:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Make components to .md files
         run: |
diff --git a/.github/workflows/update-oam-defs.yml b/.github/workflows/update-oam-defs.yml
index b0859466..bd0cce73 100644
--- a/.github/workflows/update-oam-defs.yml
+++ b/.github/workflows/update-oam-defs.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.19
+          go-version: 1.21
       - name: Run adapter to create components
         run: |
           touch log.txt
diff --git a/Dockerfile b/Dockerfile
index bd42ea83..d6b7d423 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM golang:1.19 as build-env
+FROM golang:1.21 as build-env
 ARG VERSION
 ARG GIT_COMMITSHA
 WORKDIR /github.com/layer5io/meshery-osm
diff --git a/Makefile b/Makefile
index 92841b82..f69c9de5 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ include build/Makefile.show-help.mk
 BUILDER=buildx-multi-arch
 ADAPTER=osm
 
-v ?= 1.19.1 # Default go version to be used
+v ?= 1.21 # Default go version to be used
 
 
 #-----------------------------------------------------------------------------
diff --git a/build/Makefile.core.mk b/build/Makefile.core.mk
index 7913155e..bc5afcce 100644
--- a/build/Makefile.core.mk
+++ b/build/Makefile.core.mk
@@ -19,7 +19,7 @@ GIT_VERSION	= $(shell git describe --tags `git rev-list --tags --max-count=1`)
 GIT_COMMITSHA = $(shell git rev-list -1 HEAD)
 GIT_STRIPPED_VERSION=$(shell git describe --tags `git rev-list --tags --max-count=1` | cut -c 2-)
 
-GOVERSION = 1.19.1
+GOVERSION = 1.21
 GOPATH = $(shell go env GOPATH)
 GOBIN  = $(GOPATH)/bin