diff --git a/Makefile b/Makefile
index 28b2020..6f48736 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ MODULE := gitlab.com/nvidia/cloud-native/go-nvlib
 
 DOCKER ?= docker
 
-GOLANG_VERSION := 1.16
+GOLANG_VERSION := 1.21.1
 
 ifeq ($(IMAGE),)
 REGISTRY ?= nvidia
diff --git a/docker/Dockerfile.devel b/docker/Dockerfile.devel
index 4fa2027..d6b6d5f 100644
--- a/docker/Dockerfile.devel
+++ b/docker/Dockerfile.devel
@@ -11,8 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-ARG GOLANG_VERSION=1.16
+ARG GOLANG_VERSION=1.21.1
 FROM golang:${GOLANG_VERSION}
 
-RUN go get -u golang.org/x/lint/golint
+RUN go install golang.org/x/lint/golint@latest
 RUN go install github.com/matryer/moq@v0.2.7