diff --git a/OWNERS b/OWNERS
index d4ae2241..47c05849 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,7 +2,9 @@
 
 reviewers:
   - ArangoGutierrez
-  - tariq1890
+  - kklues
   - elezar
 approvers:
-  - ArangoGutierrez # lead
+  - ArangoGutierrez
+  - kklues
+  - elezar
diff --git a/go.mod b/go.mod
index e7433c02..ff389add 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/NVIDIA/k8s-ci-artifacts
 
-go 1.21.5
+go 1.21.6
 
 require (
 	github.com/onsi/ginkgo/v2 v2.13.2
diff --git a/images/devel/Dockerfile b/images/devel/Dockerfile
new file mode 100644
index 00000000..d30f76c0
--- /dev/null
+++ b/images/devel/Dockerfile
@@ -0,0 +1,21 @@
+# Copyright (c) 2021, NVIDIA CORPORATION.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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=x.x.x
+FROM golang:${GOLANG_VERSION}
+
+RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.0 \
+    && go install github.com/matryer/moq@latest \
+    && go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2 \
+    && go install k8s.io/code-generator/cmd/client-gen@v0.26.1