diff --git a/Dockerfile-local b/Dockerfile-local
index b6dd77fe..06585475 100644
--- a/Dockerfile-local
+++ b/Dockerfile-local
@@ -1,4 +1,4 @@
-FROM golang:1.18-stretch as build
+FROM golang:1.21.5-bullseye as build
 
 RUN apt-get update && apt-get upgrade -y
 
diff --git a/Dockerfile.local b/Dockerfile.local
index cf43b239..7624fe98 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -1,4 +1,4 @@
-FROM golang:1.21.7-bullseye as build
+FROM golang:1.21.5-bullseye as build
 
 ENV GOCACHE=/go/.go/cache GOPATH=/go/.go/path TZ=Europe/London
 
diff --git a/ci/build.yml b/ci/build.yml
index bb74d7b7..56e2b2dc 100644
--- a/ci/build.yml
+++ b/ci/build.yml
@@ -6,7 +6,7 @@ image_resource:
   type: docker-image
   source:
     repository: golang
-    tag: 1.21.7-bullseye
+    tag: 1.21.5-bullseye
 
 inputs:
   - name: dp-dataset-api
diff --git a/ci/lint.yml b/ci/lint.yml
index 843ca272..4e019c0f 100644
--- a/ci/lint.yml
+++ b/ci/lint.yml
@@ -6,7 +6,7 @@ image_resource:
   type: docker-image
   source:
     repository: golang
-    tag: 1.21.7-bullseye
+    tag: 1.21.5-bullseye
 
 inputs:
   - name: dp-dataset-api
diff --git a/ci/unit.yml b/ci/unit.yml
index bebff762..15dba240 100644
--- a/ci/unit.yml
+++ b/ci/unit.yml
@@ -6,7 +6,7 @@ image_resource:
   type: docker-image
   source:
     repository: golang
-    tag: 1.21.7-bullseye
+    tag: 1.21.5-bullseye
 
 inputs:
   - name: dp-dataset-api
diff --git a/models/dataset_test.go b/models/dataset_test.go
index 5108a84a..61eba628 100644
--- a/models/dataset_test.go
+++ b/models/dataset_test.go
@@ -1104,13 +1104,13 @@ func TestVersionLinksDeepCopy(t *testing.T) {
 				},
 			})
 
-			So(vl2, ShouldNotBeNil)
-			So(vl2.Dataset, ShouldNotBeNil)
-			So(vl2.Dimensions, ShouldNotBeNil)
-			So(vl2.Edition, ShouldNotBeNil)
-			So(vl2.Self, ShouldNotBeNil)
-			So(vl2.Spatial, ShouldNotBeNil)
-			So(vl2.Version, ShouldNotBeNil)
+			So(vl2, ShouldNotPointTo, vl)
+			So(vl2.Dataset, ShouldNotPointTo, vl.Dataset)
+			So(vl2.Dimensions, ShouldNotPointTo, vl.Dimensions)
+			So(vl2.Edition, ShouldNotPointTo, vl.Edition)
+			So(vl2.Self, ShouldNotPointTo, vl.Self)
+			So(vl2.Spatial, ShouldNotPointTo, vl.Spatial)
+			So(vl2.Version, ShouldNotPointTo, vl.Version)
 		})
 	})
 
@@ -1120,7 +1120,7 @@ func TestVersionLinksDeepCopy(t *testing.T) {
 		Convey("Then doing a deep copy of it results in a new empty VersionLinks", func() {
 			vl2 := vl.DeepCopy()
 			So(*vl2, ShouldResemble, VersionLinks{})
-			So(vl2, ShouldNotBeNil)
+			So(vl2, ShouldNotPointTo, vl)
 		})
 	})
 }