diff --git a/controllers/slicegateway/slicegateway.go b/controllers/slicegateway/slicegateway.go
index cbe9a95f1..7a5836fc8 100644
--- a/controllers/slicegateway/slicegateway.go
+++ b/controllers/slicegateway/slicegateway.go
@@ -168,6 +168,13 @@ func (r *SliceGwReconciler) deploymentForGatewayServer(g *kubeslicev1beta1.Slice
 					},
 				},
 				Spec: corev1.PodSpec{
+					// Pod-level security context for best practices
+					SecurityContext: &corev1.PodSecurityContext{
+						RunAsNonRoot: func(b bool) *bool { return &b }(true),
+						RunAsUser:    func(i int64) *int64 { return &i }(1000),
+						FSGroup:      func(i int64) *int64 { return &i }(2000),
+					},
+					// Pod-level security context for best practices
 					ServiceAccountName: "vpn-gateway-server",
 					Affinity: &corev1.Affinity{
 						NodeAffinity: &corev1.NodeAffinity{
@@ -467,6 +474,12 @@ func (r *SliceGwReconciler) deploymentForGatewayClient(g *kubeslicev1beta1.Slice
 					},
 				},
 				Spec: corev1.PodSpec{
+					// Pod-level security context for best practices
+					SecurityContext: &corev1.PodSecurityContext{
+						RunAsNonRoot: func(b bool) *bool { return &b }(true),
+						RunAsUser:    func(i int64) *int64 { return &i }(1000),
+						FSGroup:      func(i int64) *int64 { return &i }(2000),
+					},
 					ServiceAccountName: "vpn-gateway-client",
 					Affinity: &corev1.Affinity{
 						NodeAffinity: &corev1.NodeAffinity{
diff --git a/test.Dockerfile b/test.Dockerfile
index af8a8cd33..916bc3fc6 100644
--- a/test.Dockerfile
+++ b/test.Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.23.3 AS builder
+=======
+FROM golang:1.24.0 AS builder
+>>>>>>> b6bcef51 (Fix: Update Go version in test.Dockerfile)
 
 WORKDIR /workspace
 # Copy the Go Modules manifests