diff --git a/Dockerfile b/Dockerfile
index c5604b7e..beeaf2fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Intel Corporation
+# Copyright (c) 2023 Intel Corporation
 # Copyright (c) 2021 IOTech Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-ARG BASE=golang:1.20-alpine3.17
+ARG BASE=golang:1.21-alpine3.18
 FROM ${BASE} AS builder
 
 ARG ADD_BUILD_TAGS=""
@@ -33,10 +33,10 @@ RUN [ ! -d "vendor" ] && go mod download all || echo "skipping..."
 COPY . .
 RUN $MAKE
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 LABEL license='SPDX-License-Identifier: Apache-2.0' \
-  copyright='Copyright (c) 2022: Intel'
+  copyright='Copyright (c) 2023: Intel'
 
 LABEL Name=device-rest-go Version=${VERSION}
 
diff --git a/Makefile b/Makefile
index fd291469..fa5d435c 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ lint:
 	@if [ "z${ARCH}" = "zx86_64" ] && which golangci-lint >/dev/null ; then golangci-lint run --config .golangci.yml ; else echo "WARNING: Linting skipped (not on x86_64 or linter not installed)"; fi
 
 install-lint:
-	sudo curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.51.2
+	sudo curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.54.2
 
 test: unittest lint
 	go vet ./...
diff --git a/go.mod b/go.mod
index 5e0886e7..1b4cf302 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/edgexfoundry/device-rest-go
 
-go 1.20
+go 1.21
 
 require (
 	github.com/edgexfoundry/device-sdk-go/v3 v3.1.0-dev.20