diff --git a/apis/batch.go b/apis/batch.go
index 61d7bcd4..3f7367fa 100644
--- a/apis/batch.go
+++ b/apis/batch.go
@@ -2,7 +2,7 @@ package apis
 
 import (
 	"bytes"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"io"
 	"mime/multipart"
diff --git a/apis/collection_test.go b/apis/collection_test.go
index 27051826..ff9a59ac 100644
--- a/apis/collection_test.go
+++ b/apis/collection_test.go
@@ -1617,7 +1617,7 @@ func TestCollectionOAuth2Providers(t *testing.T) {
 			},
 			ExpectedStatus: 200,
 			ExpectedContent: []string{
-				`{"name":"oidc3","displayName":"OIDC","logo":"\u003csvg`,
+				`{"name":"oidc3","displayName":"OIDC","logo":"<svg`,
 			},
 			NotExpectedContent: []string{
 				`"order":`,
diff --git a/apis/realtime.go b/apis/realtime.go
index 455fa478..d6d8b58b 100644
--- a/apis/realtime.go
+++ b/apis/realtime.go
@@ -2,7 +2,7 @@ package apis
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"log/slog"
diff --git a/apis/realtime_test.go b/apis/realtime_test.go
index 8e05163c..fa3094bc 100644
--- a/apis/realtime_test.go
+++ b/apis/realtime_test.go
@@ -2,7 +2,7 @@ package apis_test
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"net/http"
@@ -1171,7 +1171,9 @@ func TestRealtimeRecordResolve(t *testing.T) {
 
 			var mu sync.Mutex
 			notify := func(clientId string, eventData []byte) {
-				data := struct{ Action string }{}
+				data := struct {
+					Action string `json:"action"`
+				}{}
 				_ = json.Unmarshal(eventData, &data)
 
 				mu.Lock()
diff --git a/apis/record_auth_methods_test.go b/apis/record_auth_methods_test.go
index 0ea1bd67..5ae9d8cf 100644
--- a/apis/record_auth_methods_test.go
+++ b/apis/record_auth_methods_test.go
@@ -54,7 +54,7 @@ func TestRecordAuthMethodsList(t *testing.T) {
 				`"providers":[{`,
 				`"name":"google"`,
 				`"name":"gitlab"`,
-				`"logo":"\u003csvg`,
+				`"logo":"<svg`,
 				`"logo":""`, // for the legacy fields
 				`"state":`,
 				`"displayName":`,
diff --git a/apis/record_auth_with_oauth2.go b/apis/record_auth_with_oauth2.go
index 4dc41ca2..814e8737 100644
--- a/apis/record_auth_with_oauth2.go
+++ b/apis/record_auth_with_oauth2.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"context"
 	"database/sql"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"io"
diff --git a/apis/record_auth_with_oauth2_redirect.go b/apis/record_auth_with_oauth2_redirect.go
index 91f5d9d3..2c2e9964 100644
--- a/apis/record_auth_with_oauth2_redirect.go
+++ b/apis/record_auth_with_oauth2_redirect.go
@@ -1,7 +1,7 @@
 package apis
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"net/http"
 	"strings"
diff --git a/apis/record_helpers_test.go b/apis/record_helpers_test.go
index d479ef62..43f0a988 100644
--- a/apis/record_helpers_test.go
+++ b/apis/record_helpers_test.go
@@ -1,7 +1,7 @@
 package apis_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"net/http"
 	"net/http/httptest"
diff --git a/core/collection_import.go b/core/collection_import.go
index 47f15dec..e169a558 100644
--- a/core/collection_import.go
+++ b/core/collection_import.go
@@ -4,7 +4,8 @@ import (
 	"cmp"
 	"context"
 	"database/sql"
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"slices"
@@ -186,7 +187,11 @@ func (app *BaseApp) ImportCollections(toImport []map[string]any, deleteMissing b
 			)
 			if err := validator.run(); err != nil {
 				// serialize the validation error(s)
-				serializedErr, _ := json.MarshalIndent(err, "", "  ")
+				serializedErr, _ := json.Marshal(
+					err,
+					jsontext.WithIndentPrefix(""),
+					jsontext.WithIndent("  "),
+				)
 
 				return validation.Errors{"collections": validation.NewError(
 					"validation_collections_import_failure",
diff --git a/core/collection_import_test.go b/core/collection_import_test.go
index 74df2f6e..3e5f952d 100644
--- a/core/collection_import_test.go
+++ b/core/collection_import_test.go
@@ -1,7 +1,7 @@
 package core_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"strings"
 	"testing"
 
@@ -449,7 +449,7 @@ func TestImportCollectionsCreateRules(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	raw, err := json.Marshal(collection)
+	raw, err := json.Marshal(collection, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/collection_model.go b/core/collection_model.go
index bcf9e954..2ed040ab 100644
--- a/core/collection_model.go
+++ b/core/collection_model.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"strconv"
 	"strings"
@@ -522,8 +522,6 @@ func (m *Collection) unmarshalRawOptions() error {
 // For new/"blank" Collection models it replaces the model with a factory
 // instance and then unmarshal the provided data one on top of it.
 func (m *Collection) UnmarshalJSON(b []byte) error {
-	type alias *Collection
-
 	// initialize the default fields
 	// (e.g. in case the collection was NOT created using the designated factories)
 	if m.IsNew() && m.Type == "" {
@@ -540,7 +538,8 @@ func (m *Collection) UnmarshalJSON(b []byte) error {
 		*m = *blank
 	}
 
-	return json.Unmarshal(b, alias(m))
+	type alias Collection
+	return json.Unmarshal(b, (*alias)(m))
 }
 
 // MarshalJSON implements the [json.Marshaler] interface.
@@ -550,10 +549,12 @@ func (m *Collection) UnmarshalJSON(b []byte) error {
 func (m Collection) MarshalJSON() ([]byte, error) {
 	switch m.Type {
 	case CollectionTypeView:
-		return json.Marshal(struct {
+		alias := struct {
 			baseCollection
 			collectionViewOptions
-		}{m.baseCollection, m.collectionViewOptions})
+		}{m.baseCollection, m.collectionViewOptions}
+
+		return json.Marshal(alias, json.Deterministic(true))
 	case CollectionTypeAuth:
 		alias := struct {
 			baseCollection
@@ -582,15 +583,15 @@ func (m Collection) MarshalJSON() ([]byte, error) {
 			alias.OAuth2.Providers = redactedProviders
 		}
 
-		return json.Marshal(alias)
+		return json.Marshal(alias, json.Deterministic(true))
 	default:
-		return json.Marshal(m.baseCollection)
+		return json.Marshal(m.baseCollection, json.Deterministic(true))
 	}
 }
 
 // String returns a string representation of the current collection.
 func (m Collection) String() string {
-	raw, _ := json.Marshal(m)
+	raw, _ := m.MarshalJSON()
 	return string(raw)
 }
 
diff --git a/core/collection_model_auth_options_test.go b/core/collection_model_auth_options_test.go
index a0aaa3bc..45a00d03 100644
--- a/core/collection_model_auth_options_test.go
+++ b/core/collection_model_auth_options_test.go
@@ -2,7 +2,7 @@ package core_test
 
 import (
 	"bytes"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"strings"
 	"testing"
@@ -1016,8 +1016,8 @@ func TestOAuth2ProviderConfigInitProvider(t *testing.T) {
 				t.Fatalf("Expected PKCE %v, got %v", *s.expectedConfig.PKCE, provider.PKCE())
 			}
 
-			rawMeta, _ := json.Marshal(provider.Extra())
-			expectedMeta, _ := json.Marshal(s.expectedConfig.Extra)
+			rawMeta, _ := json.Marshal(provider.Extra(), json.Deterministic(true))
+			expectedMeta, _ := json.Marshal(s.expectedConfig.Extra, json.Deterministic(true))
 			if !bytes.Equal(rawMeta, expectedMeta) {
 				t.Fatalf("Expected PKCE %v, got %v", *s.expectedConfig.PKCE, provider.PKCE())
 			}
diff --git a/core/collection_model_test.go b/core/collection_model_test.go
index fec1e041..e68095a9 100644
--- a/core/collection_model_test.go
+++ b/core/collection_model_test.go
@@ -2,7 +2,7 @@ package core_test
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"slices"
@@ -618,7 +618,7 @@ func TestCollectionUnmarshalJSON(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			rawResult, err := json.Marshal(collection)
+			rawResult, err := json.Marshal(collection, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -829,7 +829,7 @@ func TestCollectionDBExport(t *testing.T) {
 		},
 		{
 			core.CollectionTypeAuth,
-			`{"createRule":"1=3","created":"2024-07-01 01:02:03.456Z","deleteRule":"1=5","fields":[{"help":"","hidden":false,"id":"f1_id","name":"f1","presentable":false,"required":false,"system":true,"type":"bool"},{"help":"","hidden":false,"id":"f2_id","name":"f2","presentable":false,"required":true,"system":false,"type":"bool"}],"id":"test_id","indexes":["CREATE INDEX idx1 on test_name(id)","CREATE INDEX idx2 on test_name(id)"],"listRule":"1=1","name":"test_name","options":{"authRule":null,"manageRule":"1=6","authAlert":{"enabled":false,"emailTemplate":{"subject":"","body":""}},"oauth2":{"providers":null,"mappedFields":{"id":"","name":"","username":"","avatarURL":""},"enabled":false},"passwordAuth":{"enabled":false,"identityFields":null},"mfa":{"enabled":false,"duration":0,"rule":""},"otp":{"enabled":false,"duration":0,"length":0,"emailTemplate":{"subject":"","body":""}},"authToken":{"duration":0},"passwordResetToken":{"duration":0},"emailChangeToken":{"duration":0},"verificationToken":{"duration":0},"fileToken":{"duration":0},"verificationTemplate":{"subject":"","body":""},"resetPasswordTemplate":{"subject":"","body":""},"confirmEmailChangeTemplate":{"subject":"","body":""}},"system":true,"type":"auth","updateRule":"1=4","updated":"2024-07-01 01:02:03.456Z","viewRule":"1=7"}`,
+			`{"createRule":"1=3","created":"2024-07-01 01:02:03.456Z","deleteRule":"1=5","fields":[{"help":"","hidden":false,"id":"f1_id","name":"f1","presentable":false,"required":false,"system":true,"type":"bool"},{"help":"","hidden":false,"id":"f2_id","name":"f2","presentable":false,"required":true,"system":false,"type":"bool"}],"id":"test_id","indexes":["CREATE INDEX idx1 on test_name(id)","CREATE INDEX idx2 on test_name(id)"],"listRule":"1=1","name":"test_name","options":{"authRule":null,"manageRule":"1=6","authAlert":{"enabled":false,"emailTemplate":{"subject":"","body":""}},"oauth2":{"providers":[],"mappedFields":{"id":"","name":"","username":"","avatarURL":""},"enabled":false},"passwordAuth":{"enabled":false,"identityFields":[]},"mfa":{"enabled":false,"duration":0,"rule":""},"otp":{"enabled":false,"duration":0,"length":0,"emailTemplate":{"subject":"","body":""}},"authToken":{"duration":0},"passwordResetToken":{"duration":0},"emailChangeToken":{"duration":0},"verificationToken":{"duration":0},"fileToken":{"duration":0},"verificationTemplate":{"subject":"","body":""},"resetPasswordTemplate":{"subject":"","body":""},"confirmEmailChangeTemplate":{"subject":"","body":""}},"system":true,"type":"auth","updateRule":"1=4","updated":"2024-07-01 01:02:03.456Z","viewRule":"1=7"}`,
 		},
 	}
 
@@ -860,7 +860,7 @@ func TestCollectionDBExport(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			raw, err := json.Marshal(result)
+			raw, err := json.Marshal(result, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/core/collection_query.go b/core/collection_query.go
index b6e47b6b..38210678 100644
--- a/core/collection_query.go
+++ b/core/collection_query.go
@@ -3,7 +3,7 @@ package core
 import (
 	"bytes"
 	"database/sql"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"slices"
@@ -324,12 +324,12 @@ func resaveViewsWithChangedFields(app App, excludeIds ...string) error {
 					f.SetId("")
 				}
 
-				encodedNewFields, err := json.Marshal(newFields)
+				encodedNewFields, err := json.Marshal(newFields, json.Deterministic(true))
 				if err != nil {
 					return err
 				}
 
-				encodedOldFields, err := json.Marshal(oldFields)
+				encodedOldFields, err := json.Marshal(oldFields, json.Deterministic(true))
 				if err != nil {
 					return err
 				}
diff --git a/core/collection_record_table_sync_test.go b/core/collection_record_table_sync_test.go
index 48b22e10..ab18e543 100644
--- a/core/collection_record_table_sync_test.go
+++ b/core/collection_record_table_sync_test.go
@@ -2,7 +2,7 @@ package core_test
 
 import (
 	"bytes"
-	"encoding/json"
+	"encoding/json/v2"
 	"testing"
 
 	"github.com/pocketbase/dbx"
@@ -278,12 +278,12 @@ func TestSingleVsMultipleValuesNormalization(t *testing.T) {
 				t.Fatalf("Failed to load record: %v", err)
 			}
 
-			encodedResult, err := json.Marshal(result)
+			encodedResult, err := json.Marshal(result, json.Deterministic(true))
 			if err != nil {
 				t.Fatalf("Failed to encode result: %v", err)
 			}
 
-			encodedExpectation, err := json.Marshal(s.expected)
+			encodedExpectation, err := json.Marshal(s.expected, json.Deterministic(true))
 			if err != nil {
 				t.Fatalf("Failed to encode expectation: %v", err)
 			}
diff --git a/core/db_table_test.go b/core/db_table_test.go
index 2dede6be..2731c8b8 100644
--- a/core/db_table_test.go
+++ b/core/db_table_test.go
@@ -3,7 +3,7 @@ package core_test
 import (
 	"context"
 	"database/sql"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"slices"
 	"testing"
@@ -120,7 +120,11 @@ func TestTableInfo(t *testing.T) {
 		t.Run(fmt.Sprintf("%d_%s", i, s.tableName), func(t *testing.T) {
 			rows, _ := app.TableInfo(s.tableName)
 
-			raw, err := json.Marshal(rows)
+			raw, err := json.Marshal(
+				rows,
+				json.Deterministic(true),
+				json.FormatNilSliceAsNull(true),
+			)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/core/event_request_test.go b/core/event_request_test.go
index 6cfc3dc0..26a331a4 100644
--- a/core/event_request_test.go
+++ b/core/event_request_test.go
@@ -1,7 +1,7 @@
 package core_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"net/http"
 	"strings"
 	"testing"
@@ -183,7 +183,7 @@ func TestRequestEventRequestInfo(t *testing.T) {
 			t.Fatalf("Failed to resolve request info: %v", err)
 		}
 
-		raw, err := json.Marshal(info)
+		raw, err := json.Marshal(info, json.Deterministic(true))
 		if err != nil {
 			t.Fatalf("Failed to serialize request info: %v", err)
 		}
@@ -205,7 +205,7 @@ func TestRequestEventRequestInfo(t *testing.T) {
 			t.Fatalf("Failed to resolve request info: %v", err)
 		}
 
-		raw, err := json.Marshal(info)
+		raw, err := json.Marshal(info, json.Deterministic(true))
 		if err != nil {
 			t.Fatalf("Failed to serialize request info: %v", err)
 		}
@@ -308,7 +308,7 @@ func TestRequestInfoClone(t *testing.T) {
 
 	// check the original data
 	// ---
-	originalRaw, err := json.Marshal(info)
+	originalRaw, err := json.Marshal(info, json.Deterministic(true))
 	if err != nil {
 		t.Fatalf("Failed to serialize original request info: %v", err)
 	}
@@ -321,7 +321,7 @@ func TestRequestInfoClone(t *testing.T) {
 
 	// check the clone data
 	// ---
-	cloneRaw, err := json.Marshal(clone)
+	cloneRaw, err := json.Marshal(clone, json.Deterministic(true))
 	if err != nil {
 		t.Fatalf("Failed to serialize clone request info: %v", err)
 	}
diff --git a/core/field_file_test.go b/core/field_file_test.go
index 71b29f4c..472fc368 100644
--- a/core/field_file_test.go
+++ b/core/field_file_test.go
@@ -3,7 +3,7 @@ package core_test
 import (
 	"bytes"
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"slices"
@@ -98,7 +98,7 @@ func TestFileFieldPrepareValue(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	f1Raw, err := json.Marshal(f1)
+	f1Raw, err := json.Marshal(f1, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -143,7 +143,7 @@ func TestFileFieldPrepareValue(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			vRaw, err := json.Marshal(v)
+			vRaw, err := json.Marshal(v, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -212,7 +212,7 @@ func TestFileFieldDriverValue(t *testing.T) {
 				}
 			}
 
-			vRaw, err := json.Marshal(v)
+			vRaw, err := json.Marshal(v, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -699,7 +699,7 @@ func TestFileFieldFindGetter(t *testing.T) {
 
 			v := getter(record)
 
-			raw, err := json.Marshal(v)
+			raw, err := json.Marshal(v, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -816,7 +816,7 @@ func TestFileFieldFindSetter(t *testing.T) {
 
 			setter(record, s.value)
 
-			raw, err := json.Marshal(record.Get(s.field.GetName()))
+			raw, err := json.Marshal(record.Get(s.field.GetName()), json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -915,8 +915,8 @@ func TestFileFieldIntercept(t *testing.T) {
 
 		tests.TestValidationErrors(t, err, []string{"text"})
 
-		raw, _ := json.Marshal(record.GetRaw("file_many"))
-		expectedRaw, _ := json.Marshal([]any{f1.Name, f3})
+		raw, _ := json.Marshal(record.GetRaw("file_many"), json.Deterministic(true))
+		expectedRaw, _ := json.Marshal([]any{f1.Name, f3}, json.Deterministic(true))
 		if !bytes.Equal(expectedRaw, raw) {
 			t.Fatalf("Expected file field value\n%s\ngot\n%s", expectedRaw, raw)
 		}
@@ -935,8 +935,8 @@ func TestFileFieldIntercept(t *testing.T) {
 			t.Fatalf("Expected save to succeed, got %v", err)
 		}
 
-		raw, _ := json.Marshal(record.GetRaw("file_many"))
-		expectedRaw, _ := json.Marshal([]any{f1.Name, f3.Name})
+		raw, _ := json.Marshal(record.GetRaw("file_many"), json.Deterministic(true))
+		expectedRaw, _ := json.Marshal([]any{f1.Name, f3.Name}, json.Deterministic(true))
 		if !bytes.Equal(expectedRaw, raw) {
 			t.Fatalf("Expected file field value\n%s\ngot\n%s", expectedRaw, raw)
 		}
@@ -956,8 +956,8 @@ func TestFileFieldIntercept(t *testing.T) {
 			t.Fatalf("Expected save to succeed, got %v", err)
 		}
 
-		raw, _ := json.Marshal(record.GetRaw("file_many"))
-		expectedRaw, _ := json.Marshal([]any{f3.Name, f4.Name})
+		raw, _ := json.Marshal(record.GetRaw("file_many"), json.Deterministic(true))
+		expectedRaw, _ := json.Marshal([]any{f3.Name, f4.Name}, json.Deterministic(true))
 		if !bytes.Equal(expectedRaw, raw) {
 			t.Fatalf("Expected file field value\n%s\ngot\n%s", expectedRaw, raw)
 		}
@@ -1067,8 +1067,8 @@ func TestFileFieldInterceptTx(t *testing.T) {
 					t.Fatalf("Expected save to succeed, got %v", err)
 				}
 
-				raw, _ := json.Marshal(record.GetRaw("file_many"))
-				expectedRaw, _ := json.Marshal([]any{f1.Name, f3.Name})
+				raw, _ := json.Marshal(record.GetRaw("file_many"), json.Deterministic(true))
+				expectedRaw, _ := json.Marshal([]any{f1.Name, f3.Name}, json.Deterministic(true))
 				if !bytes.Equal(expectedRaw, raw) {
 					t.Fatalf("Expected file field value\n%s\ngot\n%s", expectedRaw, raw)
 				}
@@ -1090,8 +1090,8 @@ func TestFileFieldInterceptTx(t *testing.T) {
 					t.Fatalf("Expected save to succeed, got %v", err)
 				}
 
-				raw, _ := json.Marshal(record.GetRaw("file_many"))
-				expectedRaw, _ := json.Marshal([]any{f3.Name, f4.Name})
+				raw, _ := json.Marshal(record.GetRaw("file_many"), json.Deterministic(true))
+				expectedRaw, _ := json.Marshal([]any{f3.Name, f4.Name}, json.Deterministic(true))
 				if !bytes.Equal(expectedRaw, raw) {
 					t.Fatalf("Expected file field value\n%s\ngot\n%s", expectedRaw, raw)
 				}
diff --git a/core/field_geo_point_test.go b/core/field_geo_point_test.go
index 2800a4f2..7597f8e1 100644
--- a/core/field_geo_point_test.go
+++ b/core/field_geo_point_test.go
@@ -2,7 +2,7 @@ package core_test
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"testing"
 
@@ -57,7 +57,7 @@ func TestGeoPointFieldPrepareValue(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			raw, err := json.Marshal(v)
+			raw, err := json.Marshal(v, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/core/field_password_test.go b/core/field_password_test.go
index 39733e62..b7c9e019 100644
--- a/core/field_password_test.go
+++ b/core/field_password_test.go
@@ -2,7 +2,7 @@ package core_test
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"strings"
@@ -496,7 +496,7 @@ func TestPasswordFieldFindSetter(t *testing.T) {
 
 			setter(record, s.value)
 
-			raw, err := json.Marshal(record.Get(s.field.GetName()))
+			raw, err := json.Marshal(record.Get(s.field.GetName()), json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/core/field_relation_test.go b/core/field_relation_test.go
index 501530fe..7a05817d 100644
--- a/core/field_relation_test.go
+++ b/core/field_relation_test.go
@@ -2,7 +2,7 @@ package core_test
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"testing"
 
@@ -119,7 +119,7 @@ func TestRelationFieldPrepareValue(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			vRaw, err := json.Marshal(v)
+			vRaw, err := json.Marshal(v, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -181,7 +181,7 @@ func TestRelationFieldDriverValue(t *testing.T) {
 				}
 			}
 
-			vRaw, err := json.Marshal(v)
+			vRaw, err := json.Marshal(v, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -590,7 +590,7 @@ func TestRelationFieldFindSetter(t *testing.T) {
 
 			setter(record, s.value)
 
-			raw, err := json.Marshal(record.Get(s.field.GetName()))
+			raw, err := json.Marshal(record.Get(s.field.GetName()), json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/core/field_select_test.go b/core/field_select_test.go
index 093c7011..6e716a84 100644
--- a/core/field_select_test.go
+++ b/core/field_select_test.go
@@ -2,7 +2,7 @@ package core_test
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"testing"
 
@@ -119,7 +119,7 @@ func TestSelectFieldPrepareValue(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			vRaw, err := json.Marshal(v)
+			vRaw, err := json.Marshal(v, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -181,7 +181,7 @@ func TestSelectFieldDriverValue(t *testing.T) {
 				}
 			}
 
-			vRaw, err := json.Marshal(v)
+			vRaw, err := json.Marshal(v, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -503,7 +503,7 @@ func TestSelectFieldFindSetter(t *testing.T) {
 
 			setter(record, s.value)
 
-			raw, err := json.Marshal(record.Get(s.field.GetName()))
+			raw, err := json.Marshal(record.Get(s.field.GetName()), json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/core/field_test.go b/core/field_test.go
index e94f5a51..d28f2071 100644
--- a/core/field_test.go
+++ b/core/field_test.go
@@ -2,7 +2,7 @@ package core_test
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"reflect"
 	"strings"
 	"testing"
diff --git a/core/fields_list.go b/core/fields_list.go
index 31f22c26..cc6262bf 100644
--- a/core/fields_list.go
+++ b/core/fields_list.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	"database/sql/driver"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"slices"
 	"strconv"
@@ -277,7 +277,7 @@ func (l *FieldsList) add(pos int, newField Field) {
 
 // String returns the string representation of the current list.
 func (l FieldsList) String() string {
-	v, _ := json.Marshal(l)
+	v, _ := l.MarshalJSON()
 	return string(v)
 }
 
@@ -355,12 +355,12 @@ func (l FieldsList) MarshalJSON() ([]byte, error) {
 		wrapper = append(wrapper, data)
 	}
 
-	return json.Marshal(wrapper)
+	return json.Marshal(wrapper, json.Deterministic(true))
 }
 
 // Value implements the [driver.Valuer] interface.
 func (l FieldsList) Value() (driver.Value, error) {
-	data, err := json.Marshal(l)
+	data, err := l.MarshalJSON()
 
 	return string(data), err
 }
diff --git a/core/fields_list_test.go b/core/fields_list_test.go
index 13457e39..2b30952d 100644
--- a/core/fields_list_test.go
+++ b/core/fields_list_test.go
@@ -2,7 +2,7 @@ package core_test
 
 import (
 	"bytes"
-	"encoding/json"
+	"encoding/json/v2"
 	"slices"
 	"strconv"
 	"strings"
diff --git a/core/log_query_test.go b/core/log_query_test.go
index df361987..03694cb3 100644
--- a/core/log_query_test.go
+++ b/core/log_query_test.go
@@ -1,7 +1,7 @@
 package core_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"testing"
 	"time"
@@ -63,7 +63,7 @@ func TestLogsStats(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	encoded, _ := json.Marshal(result)
+	encoded, _ := json.Marshal(result, json.Deterministic(true))
 	if string(encoded) != expected {
 		t.Fatalf("Expected\n%q\ngot\n%q", expected, string(encoded))
 	}
diff --git a/core/migrations_runner_test.go b/core/migrations_runner_test.go
index a4c0c93f..d16e4e2f 100644
--- a/core/migrations_runner_test.go
+++ b/core/migrations_runner_test.go
@@ -1,7 +1,7 @@
 package core_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"testing"
 	"time"
diff --git a/core/record_field_resolver.go b/core/record_field_resolver.go
index caabe131..425cc5ef 100644
--- a/core/record_field_resolver.go
+++ b/core/record_field_resolver.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"slices"
@@ -354,7 +354,7 @@ func (r *RecordFieldResolver) resolveStaticRequestField(path ...string) (*search
 
 		// if that doesn't work, try encoding it
 		if castErr != nil {
-			encoded, jsonErr := json.Marshal(v)
+			encoded, jsonErr := json.Marshal(v, json.Deterministic(true))
 			if jsonErr == nil {
 				val = string(encoded)
 			}
diff --git a/core/record_field_resolver_runner.go b/core/record_field_resolver_runner.go
index f44fd147..fa65893e 100644
--- a/core/record_field_resolver_runner.go
+++ b/core/record_field_resolver_runner.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"reflect"
@@ -333,7 +333,7 @@ func (r *runner) processRequestBodyEachModifier(bodyField Field) (*search.Resolv
 	}
 
 	bodyItems := toSlice(r.resolver.requestInfo.Body[bodyField.GetName()])
-	bodyItemsRaw, err := json.Marshal(bodyItems)
+	bodyItemsRaw, err := json.Marshal(bodyItems, json.Deterministic(true))
 	if err != nil {
 		return nil, fmt.Errorf("cannot serialize the data for field %q", r.activeProps[2])
 	}
diff --git a/core/record_field_resolver_test.go b/core/record_field_resolver_test.go
index f232368d..7b9917c4 100644
--- a/core/record_field_resolver_test.go
+++ b/core/record_field_resolver_test.go
@@ -1,7 +1,7 @@
 package core_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"regexp"
 	"slices"
 	"strings"
@@ -940,7 +940,7 @@ func TestRecordFieldResolverResolveStaticRequestInfoFields(t *testing.T) {
 				t.Fatalf("Expected parameter r.Identifier %q, got %q", paramName, r.Identifier)
 			}
 
-			encodedParamValue, _ := json.Marshal(paramValue)
+			encodedParamValue, _ := json.Marshal(paramValue, json.Deterministic(true))
 			if string(encodedParamValue) != s.expectParamValue {
 				t.Fatalf("Expected r.Params %#v for %s, got %#v", s.expectParamValue, r.Identifier, string(encodedParamValue))
 			}
diff --git a/core/record_model.go b/core/record_model.go
index a0c0617c..81e7ee28 100644
--- a/core/record_model.go
+++ b/core/record_model.go
@@ -3,7 +3,7 @@ package core
 import (
 	"bytes"
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"log"
@@ -1218,12 +1218,12 @@ func areValuesEqual(a any, b any) bool {
 		bv, ok := b.(types.JSONRaw)
 		return ok && bytes.Equal(av, bv)
 	default:
-		aRaw, err := json.Marshal(a)
+		aRaw, err := json.Marshal(a, json.Deterministic(true))
 		if err != nil {
 			return false
 		}
 
-		bRaw, err := json.Marshal(b)
+		bRaw, err := json.Marshal(b, json.Deterministic(true))
 		if err != nil {
 			return false
 		}
@@ -1324,7 +1324,7 @@ func (record *Record) PublicExport() map[string]any {
 //
 // Only the data exported by `PublicExport()` will be serialized.
 func (m Record) MarshalJSON() ([]byte, error) {
-	return json.Marshal(m.PublicExport())
+	return json.Marshal(m.PublicExport(), json.Deterministic(true))
 }
 
 // UnmarshalJSON implements the [json.Unmarshaler] interface.
diff --git a/core/record_model_test.go b/core/record_model_test.go
index a65c00a5..48e4c634 100644
--- a/core/record_model_test.go
+++ b/core/record_model_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"context"
 	"database/sql"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"regexp"
@@ -31,7 +31,7 @@ func TestNewRecord(t *testing.T) {
 
 	m := core.NewRecord(collection)
 
-	rawData, err := json.Marshal(m.FieldsData()) // should be initialized with the defaults
+	rawData, err := json.Marshal(m.FieldsData(), json.Deterministic(true)) // should be initialized with the defaults
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -520,7 +520,7 @@ func TestRecordMergeExpand(t *testing.T) {
 
 	result := m.Expand()
 
-	raw, err := json.Marshal(result)
+	raw, err := json.Marshal(result, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -566,7 +566,7 @@ func TestRecordMergeExpandNilCheck(t *testing.T) {
 			m := core.NewRecord(collection)
 			m.MergeExpand(s.expand)
 
-			raw, err := json.Marshal(m)
+			raw, err := json.Marshal(m, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -663,7 +663,7 @@ func TestRecordFieldsData(t *testing.T) {
 	m.Set("field2", 456)
 	m.Set("unknown", 789)
 
-	raw, err := json.Marshal(m.FieldsData())
+	raw, err := json.Marshal(m.FieldsData(), json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -691,7 +691,7 @@ func TestRecordCustomData(t *testing.T) {
 	m.Set("field2", 456)
 	m.Set("unknown", 789)
 
-	raw, err := json.Marshal(m.CustomData())
+	raw, err := json.Marshal(m.CustomData(), json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1103,14 +1103,16 @@ func TestRecordGetUnsavedFiles(t *testing.T) {
 		t.Run(fmt.Sprintf("%d_%#v", i, s.key), func(t *testing.T) {
 			v := record.GetUnsavedFiles(s.key)
 
-			raw, err := json.Marshal(v)
+			raw, err := json.Marshal(v,
+				json.Deterministic(true),
+				json.FormatNilSliceAsNull(true),
+			)
 			if err != nil {
 				t.Fatal(err)
 			}
-			rawStr := string(raw)
 
-			if rawStr != s.expected {
-				t.Fatalf("Expected\n%s\ngot\n%s", s.expected, rawStr)
+			if str := string(raw); str != s.expected {
+				t.Fatalf("Expected\n%s\ngot\n%s", s.expected, str)
 			}
 		})
 	}
@@ -1164,7 +1166,7 @@ func TestRecordUnmarshalJSONField(t *testing.T) {
 				t.Fatalf("Expected hasErr %v, got %v", s.expectError, hasErr)
 			}
 
-			raw, _ := json.Marshal(s.destination)
+			raw, _ := json.Marshal(s.destination, json.Deterministic(true))
 			if v := string(raw); v != s.expectedJSON {
 				t.Fatalf("Expected %q, got %q", s.expectedJSON, v)
 			}
@@ -1271,7 +1273,7 @@ func TestRecordDBExport(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			raw, err := json.Marshal(result)
+			raw, err := json.Marshal(result, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -1515,7 +1517,7 @@ func TestRecordPublicExportAndMarshalJSON(t *testing.T) {
 			m.Unhide(s.unhideFields...)
 			m.Hide(s.hideFields...)
 
-			exportResult, err := json.Marshal(m.PublicExport())
+			exportResult, err := json.Marshal(m.PublicExport(), json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/core/record_query_expand_test.go b/core/record_query_expand_test.go
index 3e23c509..116ea788 100644
--- a/core/record_query_expand_test.go
+++ b/core/record_query_expand_test.go
@@ -3,7 +3,7 @@ package core_test
 import (
 	"context"
 	"database/sql"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"strings"
 	"testing"
@@ -240,7 +240,7 @@ func TestExpandRecords(t *testing.T) {
 				t.Errorf("Expected %d failures, got %d\n%v", s.expectExpandFailures, len(failed), failed)
 			}
 
-			encoded, _ := json.Marshal(records)
+			encoded, _ := json.Marshal(records, json.Deterministic(true))
 			encodedStr := string(encoded)
 			totalExpandProps := strings.Count(encodedStr, `"`+core.FieldNameExpand+`":`)
 			totalEmptyExpands := strings.Count(encodedStr, `"`+core.FieldNameExpand+`":{}`)
@@ -420,7 +420,7 @@ func TestExpandRecord(t *testing.T) {
 				t.Errorf("Expected %d failures, got %d\n%v", s.expectExpandFailures, len(failed), failed)
 			}
 
-			encoded, _ := json.Marshal(record)
+			encoded, _ := json.Marshal(record, json.Deterministic(true))
 			encodedStr := string(encoded)
 			totalExpandProps := strings.Count(encodedStr, `"`+core.FieldNameExpand+`":`)
 			totalEmptyExpands := strings.Count(encodedStr, `"`+core.FieldNameExpand+`":{}`)
diff --git a/core/record_query_test.go b/core/record_query_test.go
index 91c1ab17..02a9f408 100644
--- a/core/record_query_test.go
+++ b/core/record_query_test.go
@@ -1,7 +1,7 @@
 package core_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"slices"
@@ -107,7 +107,7 @@ func TestRecordQueryOne(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			raw, err := json.Marshal(s.model)
+			raw, err := json.Marshal(s.model, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -192,7 +192,7 @@ func TestRecordQueryAll(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			raw, err := json.Marshal(s.result)
+			raw, err := json.Marshal(s.result, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/core/settings_model.go b/core/settings_model.go
index 4b0e95f0..054bfb9b 100644
--- a/core/settings_model.go
+++ b/core/settings_model.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"os"
@@ -237,7 +237,7 @@ func (s *Settings) String() string {
 	s.mu.RLock()
 	defer s.mu.RUnlock()
 
-	raw, _ := json.Marshal(s)
+	raw, _ := s.MarshalJSON()
 	return string(raw)
 }
 
@@ -264,7 +264,7 @@ func (s *Settings) DBExport(app App) (map[string]any, error) {
 		s.settings.SuperuserIPs = []string{}
 	}
 
-	encoded, err := json.Marshal(s.settings)
+	encoded, err := json.Marshal(s.settings, json.Deterministic(true))
 	if err != nil {
 		return nil, err
 	}
@@ -361,7 +361,7 @@ func (s *Settings) MarshalJSON() ([]byte, error) {
 		copy.SuperuserIPs = []string{}
 	}
 
-	return json.Marshal(copy)
+	return json.Marshal(copy, json.Deterministic(true))
 }
 
 // -------------------------------------------------------------------
diff --git a/core/settings_model_test.go b/core/settings_model_test.go
index e40c7fa0..1725e636 100644
--- a/core/settings_model_test.go
+++ b/core/settings_model_test.go
@@ -1,7 +1,7 @@
 package core_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"os"
 	"strings"
@@ -112,12 +112,12 @@ func TestSettingsMerge(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	s1Encoded, err := json.Marshal(s1)
+	s1Encoded, err := json.Marshal(s1, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	s2Encoded, err := json.Marshal(s2)
+	s2Encoded, err := json.Marshal(s2, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -138,12 +138,12 @@ func TestSettingsClone(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	s1Bytes, err := json.Marshal(s1)
+	s1Bytes, err := json.Marshal(s1, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	s2Bytes, err := json.Marshal(s2)
+	s2Bytes, err := json.Marshal(s2, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -174,7 +174,7 @@ func TestSettingsMarshalJSON(t *testing.T) {
 	settings.S3.Secret = testSecret
 	settings.Backups.S3.Secret = testSecret
 
-	raw, err := json.Marshal(settings)
+	raw, err := json.Marshal(settings, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -228,7 +228,7 @@ func TestSettingsValidate(t *testing.T) {
 		`"rateLimits":{`,
 	}
 
-	errBytes, _ := json.Marshal(err)
+	errBytes, _ := json.Marshal(err, json.Deterministic(true))
 	jsonErr := string(errBytes)
 	for _, expected := range expectations {
 		if !strings.Contains(jsonErr, expected) {
diff --git a/core/settings_query.go b/core/settings_query.go
index 2adbb3d9..d71eb2df 100644
--- a/core/settings_query.go
+++ b/core/settings_query.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	"database/sql"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"os"
diff --git a/core/view_test.go b/core/view_test.go
index 5d9dc968..56685579 100644
--- a/core/view_test.go
+++ b/core/view_test.go
@@ -1,7 +1,7 @@
 package core_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"slices"
 	"testing"
@@ -530,7 +530,7 @@ func TestCreateViewFields(t *testing.T) {
 			}
 
 			if len(s.expectFields) != len(result) {
-				serialized, _ := json.Marshal(result)
+				serialized, _ := json.Marshal(result, json.Deterministic(true))
 				t.Fatalf("Expected %d fields, got %d: \n%s", len(s.expectFields), len(result), serialized)
 			}
 
@@ -835,7 +835,7 @@ func TestDryRunView(t *testing.T) {
 			// check fields
 			// ---
 			if len(s.expectFields) != len(result.Fields) {
-				serialized, _ := json.Marshal(result.Fields)
+				serialized, _ := json.Marshal(result.Fields, json.Deterministic(true))
 				t.Fatalf("Expected %d fields, got %d: \n%s", len(s.expectFields), len(result.Fields), serialized)
 			}
 			for name, typ := range s.expectFields {
diff --git a/forms/apple_client_secret_create_test.go b/forms/apple_client_secret_create_test.go
index 4778d486..66092973 100644
--- a/forms/apple_client_secret_create_test.go
+++ b/forms/apple_client_secret_create_test.go
@@ -5,7 +5,7 @@ import (
 	"crypto/elliptic"
 	"crypto/rand"
 	"crypto/x509"
-	"encoding/json"
+	"encoding/json/v2"
 	"encoding/pem"
 	"testing"
 
diff --git a/forms/record_upsert_test.go b/forms/record_upsert_test.go
index 4cc1fa9f..bd985a43 100644
--- a/forms/record_upsert_test.go
+++ b/forms/record_upsert_test.go
@@ -2,7 +2,7 @@ package forms_test
 
 import (
 	"bytes"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"maps"
 	"os"
diff --git a/go.mod b/go.mod
index 343213b6..59ebdc94 100644
--- a/go.mod
+++ b/go.mod
@@ -39,6 +39,7 @@ require (
 	github.com/ncruces/go-strftime v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/stretchr/testify v1.8.0 // indirect
 	golang.org/x/mod v0.40.0 // indirect
 	golang.org/x/sys v0.47.0 // indirect
 	golang.org/x/text v0.41.0 // indirect
diff --git a/go.sum b/go.sum
index 1cafaebc..9928a2c1 100644
--- a/go.sum
+++ b/go.sum
@@ -4,8 +4,9 @@ github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:o
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/dlclark/regexp2/v2 v2.5.2 h1:HAsucWRhsqcDzl6Ua9aR8JwYOTzrZyPrF0/FNxJVAI0=
@@ -80,8 +81,11 @@ github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
 github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M=
@@ -111,8 +115,10 @@ golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo
 google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 modernc.org/cc/v4 v4.29.0 h1:CXgwL8cvxmyzBQZzbSl/6xFtMCryb6u8IOqDci39cgc=
 modernc.org/cc/v4 v4.29.0/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI=
 modernc.org/ccgo/v4 v4.34.6 h1:sBgfIwyN0TQ9C5hwIeuqyeAKyMWnbvj2fvpF4L11uzU=
diff --git a/migrations/1717233556_v0.23_migrate.go b/migrations/1717233556_v0.23_migrate.go
index c6b9818a..6be14bfb 100644
--- a/migrations/1717233556_v0.23_migrate.go
+++ b/migrations/1717233556_v0.23_migrate.go
@@ -1,7 +1,7 @@
 package migrations
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"os"
diff --git a/plugins/ghupdate/ghupdate.go b/plugins/ghupdate/ghupdate.go
index 0a4c9618..340af1ac 100644
--- a/plugins/ghupdate/ghupdate.go
+++ b/plugins/ghupdate/ghupdate.go
@@ -8,7 +8,7 @@ package ghupdate
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"io"
diff --git a/plugins/jsvm/binds.go b/plugins/jsvm/binds.go
index 77db1cb5..df310222 100644
--- a/plugins/jsvm/binds.go
+++ b/plugins/jsvm/binds.go
@@ -3,7 +3,7 @@ package jsvm
 import (
 	"bytes"
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"io"
 	"io/fs"
@@ -352,7 +352,7 @@ func BindCore(vm *goja.Runtime) {
 			}
 
 			// as a last attempt try to json encode the value
-			rawBytes, _ := json.Marshal(raw)
+			rawBytes, _ := json.Marshal(raw, json.Deterministic(true))
 
 			return rawBytes, nil
 		}
@@ -381,7 +381,7 @@ func BindCore(vm *goja.Runtime) {
 			}
 
 			// as a last attempt try to json encode the value
-			rawBytes, _ := json.Marshal(raw)
+			rawBytes, _ := json.Marshal(raw, json.Deterministic(true))
 
 			return string(rawBytes), nil
 		}
@@ -1217,13 +1217,13 @@ func newDynamicModel(shape map[string]any) any {
 		case reflect.Map:
 			raw, _ := json.Marshal(v)
 			newV := types.JSONMap[any]{}
-			newV.Scan(raw)
+			_ = newV.Scan(raw)
 			v = newV
 			vt = reflect.TypeOf(v)
 		case reflect.Slice, reflect.Array:
 			raw, _ := json.Marshal(v)
 			newV := types.JSONArray[any]{}
-			newV.Scan(raw)
+			_ = newV.Scan(raw)
 			v = newV
 			vt = reflect.TypeOf(newV)
 		case reflect.Pointer:
diff --git a/plugins/jsvm/binds_test.go b/plugins/jsvm/binds_test.go
index 45d3e46b..0d8ca9b9 100644
--- a/plugins/jsvm/binds_test.go
+++ b/plugins/jsvm/binds_test.go
@@ -2,7 +2,7 @@ package jsvm
 
 import (
 	"bytes"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"io"
@@ -505,12 +505,12 @@ func TestBindCoreMailerMessage(t *testing.T) {
 		t.Fatalf("Expected mailer.Message, got %v", m)
 	}
 
-	raw, err := json.Marshal(m)
+	raw, err := json.Marshal(m, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	expected := `{"from":{"Name":"test_from","Address":"test_from@example.com"},"to":[{"Name":"test_to1","Address":"test_to1@example.com"},{"Name":"test_to2","Address":"test_to2@example.com"}],"bcc":[{"Name":"test_bcc1","Address":"test_bcc1@example.com"},{"Name":"test_bcc2","Address":"test_bcc2@example.com"}],"cc":[{"Name":"test_cc1","Address":"test_cc1@example.com"},{"Name":"test_cc2","Address":"test_cc2@example.com"}],"subject":"test_subject","html":"test_html","text":"test_text","headers":{"header1":"a","header2":"b"},"attachments":null,"inlineAttachments":null}`
+	expected := `{"from":{"Name":"test_from","Address":"test_from@example.com"},"to":[{"Name":"test_to1","Address":"test_to1@example.com"},{"Name":"test_to2","Address":"test_to2@example.com"}],"bcc":[{"Name":"test_bcc1","Address":"test_bcc1@example.com"},{"Name":"test_bcc2","Address":"test_bcc2@example.com"}],"cc":[{"Name":"test_cc1","Address":"test_cc1@example.com"},{"Name":"test_cc2","Address":"test_cc2@example.com"}],"subject":"test_subject","html":"test_html","text":"test_text","headers":{"header1":"a","header2":"b"},"attachments":{},"inlineAttachments":{}}`
 
 	if string(raw) != expected {
 		t.Fatalf("Expected \n%s, \ngot \n%s", expected, raw)
@@ -1178,7 +1178,7 @@ func TestBindApisErrors(t *testing.T) {
 			t.Errorf("[%s] Expected Message %q, got %q", s.js, s.expectMessage, apiErr.Message)
 		}
 
-		dataRaw, _ := json.Marshal(apiErr.RawData())
+		dataRaw, _ := json.Marshal(apiErr.RawData(), json.Deterministic(true))
 		if string(dataRaw) != s.expectData {
 			t.Errorf("[%s] Expected Data %q, got %q", s.js, s.expectData, dataRaw)
 		}
@@ -1439,7 +1439,7 @@ func TestBindHTTPSend(t *testing.T) {
 		res.Header().Add("X-Custom", "custom_header")
 		res.Header().Add("Set-Cookie", "sessionId=123456")
 
-		infoRaw, _ := json.Marshal(info)
+		infoRaw, _ := json.Marshal(info, json.Deterministic(true))
 
 		// write back the submitted request
 		res.Write(infoRaw)
diff --git a/plugins/jsvm/form_data_test.go b/plugins/jsvm/form_data_test.go
index dbf0f403..6c8c4607 100644
--- a/plugins/jsvm/form_data_test.go
+++ b/plugins/jsvm/form_data_test.go
@@ -2,7 +2,7 @@ package jsvm
 
 import (
 	"bytes"
-	"encoding/json"
+	"encoding/json/v2"
 	"strings"
 	"testing"
 
@@ -166,7 +166,7 @@ func TestFormDataEntries(t *testing.T) {
 
 	entries := data.Entries()
 
-	rawEntries, err := json.Marshal(entries)
+	rawEntries, err := json.Marshal(entries, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/plugins/migratecmd/migratecmd_test.go b/plugins/migratecmd/migratecmd_test.go
index fab857b3..2c0d95e9 100644
--- a/plugins/migratecmd/migratecmd_test.go
+++ b/plugins/migratecmd/migratecmd_test.go
@@ -93,12 +93,12 @@ migrate((app) => {
         "type": "text"
       },
       {
-        "exceptDomains": null,
+        "exceptDomains": [],
         "help": "",
         "hidden": false,
         "id": "email@TEST_RANDOM",
         "name": "email",
-        "onlyDomains": null,
+        "onlyDomains": [],
         "presentable": false,
         "required": true,
         "system": true,
@@ -200,7 +200,7 @@ migrate((app) => {
 package _test_migrations
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/core"
 	m "github.com/pocketbase/pocketbase/migrations"
@@ -275,12 +275,12 @@ func init() {
 					"type": "text"
 				},
 				{
-					"exceptDomains": null,
+					"exceptDomains": [],
 					"help": "",
 					"hidden": false,
 					"id": "email@TEST_RANDOM",
 					"name": "email",
-					"onlyDomains": null,
+					"onlyDomains": [],
 					"presentable": false,
 					"required": true,
 					"system": true,
@@ -546,12 +546,12 @@ migrate((app) => {
         "type": "text"
       },
       {
-        "exceptDomains": null,
+        "exceptDomains": [],
         "help": "",
         "hidden": false,
         "id": "email3885137012",
         "name": "email",
-        "onlyDomains": null,
+        "onlyDomains": [],
         "presentable": false,
         "required": true,
         "system": true,
@@ -649,7 +649,7 @@ migrate((app) => {
 package _test_migrations
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/core"
 	m "github.com/pocketbase/pocketbase/migrations"
@@ -731,12 +731,12 @@ func init() {
 					"type": "text"
 				},
 				{
-					"exceptDomains": null,
+					"exceptDomains": [],
 					"help": "",
 					"hidden": false,
 					"id": "email3885137012",
 					"name": "email",
-					"onlyDomains": null,
+					"onlyDomains": [],
 					"presentable": false,
 					"required": true,
 					"system": true,
@@ -1041,7 +1041,7 @@ migrate((app) => {
 package _test_migrations
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/core"
 	m "github.com/pocketbase/pocketbase/migrations"
diff --git a/plugins/migratecmd/templates.go b/plugins/migratecmd/templates.go
index 3667deb7..b135529b 100644
--- a/plugins/migratecmd/templates.go
+++ b/plugins/migratecmd/templates.go
@@ -2,7 +2,8 @@ package migratecmd
 
 import (
 	"bytes"
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"path/filepath"
@@ -383,7 +384,7 @@ func (p *plugin) goCreateTemplate(collection *core.Collection) (string, error) {
 	const template = `package %s
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/core"
 	m "github.com/pocketbase/pocketbase/migrations"
@@ -436,7 +437,7 @@ func (p *plugin) goDeleteTemplate(collection *core.Collection) (string, error) {
 	const template = `package %s
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/core"
 	m "github.com/pocketbase/pocketbase/migrations"
@@ -621,7 +622,7 @@ func (p *plugin) goDiffTemplate(new *core.Collection, old *core.Collection) (str
 
 	if strings.Contains(combined, "json.Unmarshal(") ||
 		strings.Contains(combined, "json.Marshal(") {
-		imports += "\n\t\"encoding/json\"\n"
+		imports += "\n\t\"encoding/json/v2\"\n"
 	}
 
 	imports += "\n\t\"github.com/pocketbase/pocketbase/core\""
@@ -666,7 +667,11 @@ func init() {
 }
 
 func marhshalWithoutEscape(v any, prefix string, indent string) ([]byte, error) {
-	raw, err := json.MarshalIndent(v, prefix, indent)
+	raw, err := json.Marshal(v,
+		json.Deterministic(true),
+		jsontext.WithIndentPrefix(prefix),
+		jsontext.WithIndent(indent),
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -720,8 +725,8 @@ func diffMaps(old, new map[string]any, excludeKeys ...string) map[string]any {
 		}
 
 		// compare the serialized version of the values in case of slice or other custom type
-		rawOld, _ := json.Marshal(vOld)
-		rawNew, _ := json.Marshal(vNew)
+		rawOld, _ := json.Marshal(vOld, json.Deterministic(true))
+		rawNew, _ := json.Marshal(vNew, json.Deterministic(true))
 
 		if !bytes.Equal(rawOld, rawNew) {
 			// if both are maps add recursively only the changed fields
diff --git a/tests/api.go b/tests/api.go
index 43b820a2..499a5447 100644
--- a/tests/api.go
+++ b/tests/api.go
@@ -3,7 +3,7 @@ package tests
 import (
 	"bytes"
 	"context"
-	"encoding/json"
+	"encoding/json/jsontext"
 	"fmt"
 	"io"
 	"maps"
@@ -259,14 +259,16 @@ func (scenario *ApiScenario) test(t testing.TB) {
 			}
 		} else {
 			// normalize json response format
-			buffer := new(bytes.Buffer)
-			err := json.Compact(buffer, recorder.Body.Bytes())
 			var normalizedBody string
+
+			buf := new(bytes.Buffer)
+			enc := jsontext.NewEncoder(buf)
+			err := enc.WriteValue(recorder.Body.Bytes())
 			if err != nil {
 				// not a json...
 				normalizedBody = recorder.Body.String()
 			} else {
-				normalizedBody = buffer.String()
+				normalizedBody = buf.String()
 			}
 
 			for _, item := range scenario.ExpectedContent {
diff --git a/tools/archive/create_test.go b/tools/archive/create_test.go
index f75eb8ef..178a01c7 100644
--- a/tools/archive/create_test.go
+++ b/tools/archive/create_test.go
@@ -48,7 +48,7 @@ func TestCreateSuccess(t *testing.T) {
 		t.Fatalf("Expected zip with name %q, got %q", zipName, name)
 	}
 
-	expectedSize := int64(544)
+	expectedSize := int64(532)
 	if size := info.Size(); size != expectedSize {
 		t.Fatalf("Expected zip with size %d, got %d", expectedSize, size)
 	}
diff --git a/tools/auth/apple.go b/tools/auth/apple.go
index 2a7da930..3a9cbb18 100644
--- a/tools/auth/apple.go
+++ b/tools/auth/apple.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 
diff --git a/tools/auth/auth.go b/tools/auth/auth.go
index d0a9fbe8..fcac40e5 100644
--- a/tools/auth/auth.go
+++ b/tools/auth/auth.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"net/http"
 
diff --git a/tools/auth/base_provider_test.go b/tools/auth/base_provider_test.go
index 1ec37012..b5bd7af4 100644
--- a/tools/auth/base_provider_test.go
+++ b/tools/auth/base_provider_test.go
@@ -3,7 +3,7 @@ package auth
 import (
 	"bytes"
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"testing"
 
 	"golang.org/x/oauth2"
@@ -215,12 +215,12 @@ func TestExtra(t *testing.T) {
 
 	after := b.Extra()
 
-	rawExtra, err := json.Marshal(extra)
+	rawExtra, err := json.Marshal(extra, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	rawAfter, err := json.Marshal(after)
+	rawAfter, err := json.Marshal(after, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tools/auth/bitbucket.go b/tools/auth/bitbucket.go
index 05ffa29c..fb1f39aa 100644
--- a/tools/auth/bitbucket.go
+++ b/tools/auth/bitbucket.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"io"
 
diff --git a/tools/auth/box.go b/tools/auth/box.go
index b93394c5..d139ceb3 100644
--- a/tools/auth/box.go
+++ b/tools/auth/box.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 
 	"github.com/pocketbase/pocketbase/tools/types"
diff --git a/tools/auth/discord.go b/tools/auth/discord.go
index b3588719..acd65aaa 100644
--- a/tools/auth/discord.go
+++ b/tools/auth/discord.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 
 	"github.com/pocketbase/pocketbase/tools/types"
diff --git a/tools/auth/facebook.go b/tools/auth/facebook.go
index 07f61988..dd92f980 100644
--- a/tools/auth/facebook.go
+++ b/tools/auth/facebook.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/tools/types"
 	"golang.org/x/oauth2"
@@ -53,12 +53,14 @@ func (p *Facebook) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 	}
 
 	extracted := struct {
-		Id      string
-		Name    string
-		Email   string
+		Id      string `json:"id"`
+		Name    string `json:"name"`
+		Email   string `json:"email"`
 		Picture struct {
-			Data struct{ Url string }
-		}
+			Data struct {
+				Url string `json:"url"`
+			} `json:"data"`
+		} `json:"picture"`
 	}{}
 	if err := json.Unmarshal(data, &extracted); err != nil {
 		return nil, err
diff --git a/tools/auth/gitea.go b/tools/auth/gitea.go
index 12090d82..9d25f232 100644
--- a/tools/auth/gitea.go
+++ b/tools/auth/gitea.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"io"
@@ -119,9 +119,9 @@ func (p *Gitea) fetchVerifiedPrimaryEmail(token *oauth2.Token) (string, error) {
 	}
 
 	emails := []struct {
-		Email    string
-		Verified bool
-		Primary  bool
+		Email    string `json:"email"`
+		Verified bool   `json:"verified"`
+		Primary  bool   `json:"primary"`
 	}{}
 	if err := json.Unmarshal(content, &emails); err != nil {
 		return "", err
diff --git a/tools/auth/gitee.go b/tools/auth/gitee.go
index 9bcfbeeb..45234fed 100644
--- a/tools/auth/gitee.go
+++ b/tools/auth/gitee.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"io"
 	"strconv"
 
@@ -120,9 +120,9 @@ func (p *Gitee) fetchPrimaryEmail(token *oauth2.Token) (string, error) {
 	}
 
 	emails := []struct {
-		Email string
-		State string
-		Scope []string
+		Email string   `json:"email"`
+		State string   `json:"state"`
+		Scope []string `json:"scope"`
 	}{}
 	if err := json.Unmarshal(content, &emails); err != nil {
 		// ignore unmarshal error in case "Keep my email address private"
diff --git a/tools/auth/github.go b/tools/auth/github.go
index b8d858ef..8606cc89 100644
--- a/tools/auth/github.go
+++ b/tools/auth/github.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"io"
 	"strconv"
 
@@ -116,9 +116,9 @@ func (p *Github) fetchVerifiedPrimaryEmail(token *oauth2.Token) (string, error)
 	}
 
 	emails := []struct {
-		Email    string
-		Verified bool
-		Primary  bool
+		Email    string `json:"email"`
+		Verified bool   `json:"verified"`
+		Primary  bool   `json:"primary"`
 	}{}
 	if err := json.Unmarshal(content, &emails); err != nil {
 		return "", err
diff --git a/tools/auth/gitlab.go b/tools/auth/gitlab.go
index c879743c..79eac0fd 100644
--- a/tools/auth/gitlab.go
+++ b/tools/auth/gitlab.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"strconv"
 	"time"
 
diff --git a/tools/auth/google.go b/tools/auth/google.go
index 4c6fe142..f989080b 100644
--- a/tools/auth/google.go
+++ b/tools/auth/google.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/tools/types"
 	"golang.org/x/oauth2"
diff --git a/tools/auth/instagram.go b/tools/auth/instagram.go
index 580149b7..43884e99 100644
--- a/tools/auth/instagram.go
+++ b/tools/auth/instagram.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/tools/types"
 	"golang.org/x/oauth2"
diff --git a/tools/auth/internal/jwk/jwk.go b/tools/auth/internal/jwk/jwk.go
index 27a1adec..0535b039 100644
--- a/tools/auth/internal/jwk/jwk.go
+++ b/tools/auth/internal/jwk/jwk.go
@@ -7,7 +7,7 @@ import (
 	"crypto/ed25519"
 	"crypto/rsa"
 	"encoding/base64"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"io"
@@ -105,7 +105,7 @@ func Fetch(ctx context.Context, jwksURL string, kid string) (*JWK, error) {
 	}
 
 	jwks := struct {
-		Keys []*JWK
+		Keys []*JWK `json:"keys"`
 	}{}
 
 	err = json.Unmarshal(rawBody, &jwks)
diff --git a/tools/auth/internal/jwk/jwk_test.go b/tools/auth/internal/jwk/jwk_test.go
index 189efcc2..4dc43f3b 100644
--- a/tools/auth/internal/jwk/jwk_test.go
+++ b/tools/auth/internal/jwk/jwk_test.go
@@ -7,7 +7,7 @@ import (
 	"crypto/rand"
 	"crypto/rsa"
 	"encoding/base64"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"math/big"
 	"net/http"
@@ -252,7 +252,7 @@ func TestValidateTokenSignature(t *testing.T) {
 	}
 
 	server := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-		_ = json.NewEncoder(res).Encode(map[string]any{"keys": []*jwk.JWK{
+		_ = json.MarshalWrite(res, map[string]any{"keys": []*jwk.JWK{
 			{
 				Kid: "key1",
 				Kty: "OKP",
diff --git a/tools/auth/kakao.go b/tools/auth/kakao.go
index 68fd5f54..d8c143c9 100644
--- a/tools/auth/kakao.go
+++ b/tools/auth/kakao.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"strconv"
 
 	"github.com/pocketbase/pocketbase/tools/types"
diff --git a/tools/auth/lark.go b/tools/auth/lark.go
index d4d93ef9..b8bf437a 100644
--- a/tools/auth/lark.go
+++ b/tools/auth/lark.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/tools/types"
 	"golang.org/x/oauth2"
diff --git a/tools/auth/linear.go b/tools/auth/linear.go
index bf256b1a..708c2ade 100644
--- a/tools/auth/linear.go
+++ b/tools/auth/linear.go
@@ -3,7 +3,7 @@ package auth
 import (
 	"bytes"
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"net/http"
 
@@ -68,7 +68,6 @@ func (p *Linear) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 			} `json:"viewer"`
 		} `json:"data"`
 	}{}
-
 	if err := json.Unmarshal(data, &extracted); err != nil {
 		return nil, err
 	}
diff --git a/tools/auth/livechat.go b/tools/auth/livechat.go
index 0d5d480c..ffa0be71 100644
--- a/tools/auth/livechat.go
+++ b/tools/auth/livechat.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/tools/types"
 	"golang.org/x/oauth2"
diff --git a/tools/auth/mailcow.go b/tools/auth/mailcow.go
index b7c37b9b..9f39dcb0 100644
--- a/tools/auth/mailcow.go
+++ b/tools/auth/mailcow.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"strings"
 
diff --git a/tools/auth/microsoft.go b/tools/auth/microsoft.go
index 29134673..47d42186 100644
--- a/tools/auth/microsoft.go
+++ b/tools/auth/microsoft.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"slices"
 
diff --git a/tools/auth/monday.go b/tools/auth/monday.go
index 416f1822..3dd93370 100644
--- a/tools/auth/monday.go
+++ b/tools/auth/monday.go
@@ -3,7 +3,7 @@ package auth
 import (
 	"bytes"
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"net/http"
 
diff --git a/tools/auth/notion.go b/tools/auth/notion.go
index 2a0d09dd..685d0800 100644
--- a/tools/auth/notion.go
+++ b/tools/auth/notion.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"net/http"
 
 	"github.com/pocketbase/pocketbase/tools/types"
diff --git a/tools/auth/oidc.go b/tools/auth/oidc.go
index 9390eb93..e9a30a81 100644
--- a/tools/auth/oidc.go
+++ b/tools/auth/oidc.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"os"
diff --git a/tools/auth/patreon.go b/tools/auth/patreon.go
index 3a85fc64..e3b4ca31 100644
--- a/tools/auth/patreon.go
+++ b/tools/auth/patreon.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/tools/types"
 	"golang.org/x/oauth2"
diff --git a/tools/auth/planningcenter.go b/tools/auth/planningcenter.go
index 1658f234..3ba51369 100644
--- a/tools/auth/planningcenter.go
+++ b/tools/auth/planningcenter.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 
 	"github.com/pocketbase/pocketbase/tools/types"
@@ -62,7 +62,7 @@ func (p *Planningcenter) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 				// don't map the email because users can have multiple assigned
 				// and it's not clear if they are verified
 			}
-		}
+		} `json:"data"`
 	}{}
 	if err := json.Unmarshal(data, &extracted); err != nil {
 		return nil, err
diff --git a/tools/auth/spotify.go b/tools/auth/spotify.go
index 5f4d44c5..1401cf4b 100644
--- a/tools/auth/spotify.go
+++ b/tools/auth/spotify.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/tools/types"
 	"golang.org/x/oauth2"
diff --git a/tools/auth/strava.go b/tools/auth/strava.go
index 510fb03d..3efd9074 100644
--- a/tools/auth/strava.go
+++ b/tools/auth/strava.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"strconv"
 
 	"github.com/pocketbase/pocketbase/tools/types"
diff --git a/tools/auth/trakt.go b/tools/auth/trakt.go
index 740f31bd..affa4e43 100644
--- a/tools/auth/trakt.go
+++ b/tools/auth/trakt.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"net/http"
 
 	"github.com/pocketbase/pocketbase/tools/types"
diff --git a/tools/auth/twitch.go b/tools/auth/twitch.go
index 2b336820..028ce0ae 100644
--- a/tools/auth/twitch.go
+++ b/tools/auth/twitch.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"net/http"
 
diff --git a/tools/auth/twitter.go b/tools/auth/twitter.go
index b57125c7..26de646d 100644
--- a/tools/auth/twitter.go
+++ b/tools/auth/twitter.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/tools/types"
 	"golang.org/x/oauth2"
diff --git a/tools/auth/vk.go b/tools/auth/vk.go
index fc75d200..1f91483e 100644
--- a/tools/auth/vk.go
+++ b/tools/auth/vk.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"strconv"
@@ -69,7 +69,6 @@ func (p *VK) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 			AvatarURL string `json:"photo_max"`
 		} `json:"response"`
 	}{}
-
 	if err := json.Unmarshal(data, &extracted); err != nil {
 		return nil, err
 	}
diff --git a/tools/auth/wakatime.go b/tools/auth/wakatime.go
index d2fede3b..b67f66ff 100644
--- a/tools/auth/wakatime.go
+++ b/tools/auth/wakatime.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/tools/types"
 	"golang.org/x/oauth2"
@@ -62,7 +62,6 @@ func (p *Wakatime) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 			IsEmailConfirmed bool   `json:"is_email_confirmed"`
 		} `json:"data"`
 	}{}
-
 	if err := json.Unmarshal(data, &extracted); err != nil {
 		return nil, err
 	}
diff --git a/tools/auth/yandex.go b/tools/auth/yandex.go
index 024b890d..fb02e0af 100644
--- a/tools/auth/yandex.go
+++ b/tools/auth/yandex.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 
 	"github.com/pocketbase/pocketbase/tools/types"
 	"golang.org/x/oauth2"
diff --git a/tools/cron/cron_test.go b/tools/cron/cron_test.go
index 9b6dc33f..e08954fd 100644
--- a/tools/cron/cron_test.go
+++ b/tools/cron/cron_test.go
@@ -1,7 +1,7 @@
 package cron
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"slices"
 	"sync"
 	"testing"
@@ -128,7 +128,7 @@ func TestCronAddAndRemove(t *testing.T) {
 			"test5": `{"minutes":{"1":{}},"hours":{"2":{}},"days":{"3":{}},"months":{"4":{}},"daysOfWeek":{"5":{}}}`,
 		}
 		for k, v := range expectedSchedules {
-			raw, err := json.Marshal(indexedJobs[k].schedule)
+			raw, err := json.Marshal(indexedJobs[k].schedule, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/tools/cron/job.go b/tools/cron/job.go
index 8fcabd9c..7827da52 100644
--- a/tools/cron/job.go
+++ b/tools/cron/job.go
@@ -1,6 +1,6 @@
 package cron
 
-import "encoding/json"
+import "encoding/json/v2"
 
 // Job defines a single registered cron job.
 type Job struct {
diff --git a/tools/cron/job_test.go b/tools/cron/job_test.go
index 9ce2e8ef..04fcd98e 100644
--- a/tools/cron/job_test.go
+++ b/tools/cron/job_test.go
@@ -1,7 +1,7 @@
 package cron
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"testing"
 )
 
@@ -59,7 +59,7 @@ func TestJobMarshalJSON(t *testing.T) {
 
 	j := Job{id: "test_id", schedule: s}
 
-	raw, err := json.Marshal(j)
+	raw, err := json.Marshal(j, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tools/cron/schedule_test.go b/tools/cron/schedule_test.go
index edc38e11..1e7f4751 100644
--- a/tools/cron/schedule_test.go
+++ b/tools/cron/schedule_test.go
@@ -1,7 +1,7 @@
 package cron_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"testing"
 	"time"
@@ -265,7 +265,7 @@ func TestNewSchedule(t *testing.T) {
 				return
 			}
 
-			encoded, err := json.Marshal(schedule)
+			encoded, err := json.Marshal(schedule, json.Deterministic(true))
 			if err != nil {
 				t.Fatalf("Failed to marshalize the result schedule: %v", err)
 			}
diff --git a/tools/dbutils/index_test.go b/tools/dbutils/index_test.go
index 5346c2c2..895d35c6 100644
--- a/tools/dbutils/index_test.go
+++ b/tools/dbutils/index_test.go
@@ -2,7 +2,7 @@ package dbutils_test
 
 import (
 	"bytes"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"strings"
 	"testing"
diff --git a/tools/filesystem/file_test.go b/tools/filesystem/file_test.go
index b5bca2ce..3b46150f 100644
--- a/tools/filesystem/file_test.go
+++ b/tools/filesystem/file_test.go
@@ -64,8 +64,8 @@ func TestNewFileFromPath(t *testing.T) {
 	if match, err := regexp.Match(normalizedNamePattern, []byte(f.Name)); !match {
 		t.Fatalf("Expected Name to match %v, got %q (%v)", normalizedNamePattern, f.Name, err)
 	}
-	if f.Size != 73 {
-		t.Fatalf("Expected Size %v, got %v", 73, f.Size)
+	if f.Size != 77 {
+		t.Fatalf("Expected Size %v, got %v", 77, f.Size)
 	}
 	if _, ok := f.Reader.(*filesystem.PathReader); !ok {
 		t.Fatalf("Expected Reader to be PathReader, got %v", f.Reader)
diff --git a/tools/filesystem/filesystem_test.go b/tools/filesystem/filesystem_test.go
index 9fafdfb9..4340555f 100644
--- a/tools/filesystem/filesystem_test.go
+++ b/tools/filesystem/filesystem_test.go
@@ -444,7 +444,7 @@ func TestFilesystemServe(t *testing.T) {
 			map[string]string{
 				"Content-Disposition":     `inline; filename="test_name.png"`,
 				"Content-Type":            "image/png",
-				"Content-Length":          "73",
+				"Content-Length":          "77",
 				"Content-Security-Policy": csp,
 				"Cache-Control":           cacheControl,
 			},
@@ -459,7 +459,7 @@ func TestFilesystemServe(t *testing.T) {
 			map[string]string{
 				"Content-Disposition":     `attachment; filename="test_name_download.png"`,
 				"Content-Type":            "image/png",
-				"Content-Length":          "73",
+				"Content-Length":          "77",
 				"Content-Security-Policy": csp,
 				"Cache-Control":           cacheControl,
 			},
@@ -792,8 +792,8 @@ func TestFilesystemCopy(t *testing.T) {
 	}
 	defer f.Close()
 
-	if f.Size() != 73 {
-		t.Fatalf("Expected file size %d, got %d", 73, f.Size())
+	if f.Size() != 77 {
+		t.Fatalf("Expected file size %d, got %d", 77, f.Size())
 	}
 }
 
@@ -895,7 +895,7 @@ func TestFilesystemServeSingleRange(t *testing.T) {
 		t.Fatalf("Expected StatusCode %d, got %d", http.StatusPartialContent, result.StatusCode)
 	}
 
-	expectedRange := "bytes 0-20/73"
+	expectedRange := "bytes 0-20/77"
 	if cr := result.Header.Get("Content-Range"); cr != expectedRange {
 		t.Fatalf("Expected Content-Range %q, got %q", expectedRange, cr)
 	}
diff --git a/tools/filesystem/internal/fileblob/attrs.go b/tools/filesystem/internal/fileblob/attrs.go
index 3f30ed3b..b5bbf8c9 100644
--- a/tools/filesystem/internal/fileblob/attrs.go
+++ b/tools/filesystem/internal/fileblob/attrs.go
@@ -1,7 +1,7 @@
 package fileblob
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"os"
 )
@@ -50,7 +50,8 @@ func setAttrs(path string, xa xattrs) error {
 		return err
 	}
 
-	if err := json.NewEncoder(f).Encode(xa); err != nil {
+	err = json.MarshalWrite(f, xa)
+	if err != nil {
 		f.Close()
 		os.Remove(f.Name())
 		return err
@@ -75,7 +76,9 @@ func getAttrs(path string) (xattrs, error) {
 	}
 
 	xa := new(xattrs)
-	if err := json.NewDecoder(f).Decode(xa); err != nil {
+
+	err = json.UnmarshalRead(f, xa)
+	if err != nil {
 		f.Close()
 		return xattrs{}, err
 	}
diff --git a/tools/filesystem/internal/s3blob/s3/error_test.go b/tools/filesystem/internal/s3blob/s3/error_test.go
index 4728c391..3eb77ed0 100644
--- a/tools/filesystem/internal/s3blob/s3/error_test.go
+++ b/tools/filesystem/internal/s3blob/s3/error_test.go
@@ -1,7 +1,7 @@
 package s3_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"encoding/xml"
 	"testing"
 
@@ -29,7 +29,7 @@ func TestResponseErrorSerialization(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	jsonRaw, err := json.Marshal(respErr)
+	jsonRaw, err := json.Marshal(respErr, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tools/filesystem/internal/s3blob/s3/get_object_test.go b/tools/filesystem/internal/s3blob/s3/get_object_test.go
index 3dde3b05..495b7f41 100644
--- a/tools/filesystem/internal/s3blob/s3/get_object_test.go
+++ b/tools/filesystem/internal/s3blob/s3/get_object_test.go
@@ -2,7 +2,7 @@ package s3_test
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"io"
 	"net/http"
 	"strings"
@@ -78,7 +78,7 @@ func TestS3GetObject(t *testing.T) {
 	}
 
 	// check serialized attributes
-	raw, err := json.Marshal(resp)
+	raw, err := json.Marshal(resp, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tools/filesystem/internal/s3blob/s3/head_object_test.go b/tools/filesystem/internal/s3blob/s3/head_object_test.go
index e2bf9796..4cac81b5 100644
--- a/tools/filesystem/internal/s3blob/s3/head_object_test.go
+++ b/tools/filesystem/internal/s3blob/s3/head_object_test.go
@@ -2,7 +2,7 @@ package s3_test
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"net/http"
 	"testing"
 
@@ -63,7 +63,7 @@ func TestS3HeadObject(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	raw, err := json.Marshal(resp)
+	raw, err := json.Marshal(resp, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tools/filesystem/internal/s3blob/s3/list_objects_test.go b/tools/filesystem/internal/s3blob/s3/list_objects_test.go
index cd0b7f7c..81ccd7b7 100644
--- a/tools/filesystem/internal/s3blob/s3/list_objects_test.go
+++ b/tools/filesystem/internal/s3blob/s3/list_objects_test.go
@@ -2,7 +2,7 @@ package s3_test
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"io"
 	"net/http"
 	"strings"
@@ -143,7 +143,7 @@ func TestS3ListObjects(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	raw, err := json.Marshal(resp)
+	raw, err := json.Marshal(resp, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tools/filesystem/internal/s3blob/s3blob_test.go b/tools/filesystem/internal/s3blob/s3blob_test.go
index 20d0f3b7..c420ab2c 100644
--- a/tools/filesystem/internal/s3blob/s3blob_test.go
+++ b/tools/filesystem/internal/s3blob/s3blob_test.go
@@ -2,7 +2,7 @@ package s3blob_test
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"io"
@@ -261,7 +261,11 @@ func TestDriverAttributes(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	raw, err := json.Marshal(attrs)
+	raw, err := json.Marshal(
+		attrs,
+		json.Deterministic(true),
+		json.FormatNilSliceAsNull(true),
+	)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -362,7 +366,11 @@ func TestDriverListPaged(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			raw, err := json.Marshal(page)
+			raw, err := json.Marshal(
+				page,
+				json.Deterministic(true),
+				json.FormatNilSliceAsNull(true),
+			)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -510,7 +518,11 @@ func TestDriverNewRangeReader(t *testing.T) {
 				}
 			}
 
-			rawAttrs, err := json.Marshal(r.Attributes())
+			rawAttrs, err := json.Marshal(
+				r.Attributes(),
+				json.Deterministic(true),
+				json.FormatNilSliceAsNull(true),
+			)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/tools/list/list.go b/tools/list/list.go
index 76c41eed..27c4b961 100644
--- a/tools/list/list.go
+++ b/tools/list/list.go
@@ -1,7 +1,7 @@
 package list
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"regexp"
 	"strings"
 
diff --git a/tools/list/list_test.go b/tools/list/list_test.go
index d169a75f..c1cd9b3a 100644
--- a/tools/list/list_test.go
+++ b/tools/list/list_test.go
@@ -1,7 +1,7 @@
 package list_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"testing"
 
diff --git a/tools/logger/batch_handler.go b/tools/logger/batch_handler.go
index 156215c0..08b22a51 100644
--- a/tools/logger/batch_handler.go
+++ b/tools/logger/batch_handler.go
@@ -2,7 +2,7 @@ package logger
 
 import (
 	"context"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"log/slog"
 	"sync"
diff --git a/tools/logger/batch_handler_test.go b/tools/logger/batch_handler_test.go
index efb309ac..4248d03a 100644
--- a/tools/logger/batch_handler_test.go
+++ b/tools/logger/batch_handler_test.go
@@ -2,6 +2,7 @@ package logger
 
 import (
 	"context"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"log/slog"
@@ -326,7 +327,7 @@ func TestBatchHandlerAttrsFormat(t *testing.T) {
 	for i, data := range expected {
 		t.Run(fmt.Sprintf("log handler %d", i), func(t *testing.T) {
 			log := beforeLogs[i]
-			raw, _ := log.Data.MarshalJSON()
+			raw, _ := json.Marshal(log.Data, json.Deterministic(true))
 			if string(raw) != data {
 				t.Fatalf("Expected \n%s \ngot \n%s", data, raw)
 			}
diff --git a/tools/picker/pick.go b/tools/picker/pick.go
index 2cd23aa5..a419a3e0 100644
--- a/tools/picker/pick.go
+++ b/tools/picker/pick.go
@@ -1,7 +1,7 @@
 package picker
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"strings"
 
 	"github.com/pocketbase/pocketbase/tools/search"
diff --git a/tools/picker/pick_test.go b/tools/picker/pick_test.go
index 95add588..fdd438c1 100644
--- a/tools/picker/pick_test.go
+++ b/tools/picker/pick_test.go
@@ -1,7 +1,7 @@
 package picker_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"testing"
 
 	"github.com/pocketbase/pocketbase/tools/picker"
@@ -263,7 +263,7 @@ func TestPickFields(t *testing.T) {
 				return
 			}
 
-			serialized, err := json.Marshal(result)
+			serialized, err := json.Marshal(result, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/tools/router/error_test.go b/tools/router/error_test.go
index d6b49743..a5e397bd 100644
--- a/tools/router/error_test.go
+++ b/tools/router/error_test.go
@@ -2,7 +2,7 @@ package router_test
 
 import (
 	"database/sql"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"io/fs"
@@ -22,7 +22,7 @@ func TestNewApiErrorWithRawData(t *testing.T) {
 		"rawData_test",
 	)
 
-	result, _ := json.Marshal(e)
+	result, _ := json.Marshal(e, json.Deterministic(true))
 	expected := `{"data":{},"message":"Message_test.","status":300}`
 
 	if string(result) != expected {
@@ -61,7 +61,7 @@ func TestNewApiErrorWithValidationData(t *testing.T) {
 		},
 	)
 
-	result, _ := json.Marshal(e)
+	result, _ := json.Marshal(e, json.Deterministic(true))
 	expected := `{"data":{"err1":{"code":"validation_invalid_value","message":"Invalid value."},"err2":{"code":"validation_required","message":"Cannot be blank."},"err3":{"err3.1":{"code":"validation_invalid_value","message":"Invalid value."},"err3.2":{"code":"validation_required","message":"Cannot be blank."},"err3.3":{"err3.3.1":{"code":"validation_required","message":"Cannot be blank."}}},"err4":{"code":"mock_code","message":"Mock_error.","mock_resolve":123},"err5":{"err5.1":{"code":"validation_required","message":"Cannot be blank."}}},"message":"Message_test.","status":300}`
 
 	if string(result) != expected {
@@ -93,7 +93,7 @@ func TestNewNotFoundError(t *testing.T) {
 	for i, s := range scenarios {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			e := router.NewNotFoundError(s.message, s.data)
-			result, _ := json.Marshal(e)
+			result, _ := json.Marshal(e, json.Deterministic(true))
 
 			if str := string(result); str != s.expected {
 				t.Fatalf("Expected\n%v\ngot\n%v", s.expected, str)
@@ -118,7 +118,7 @@ func TestNewBadRequestError(t *testing.T) {
 	for i, s := range scenarios {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			e := router.NewBadRequestError(s.message, s.data)
-			result, _ := json.Marshal(e)
+			result, _ := json.Marshal(e, json.Deterministic(true))
 
 			if str := string(result); str != s.expected {
 				t.Fatalf("Expected\n%v\ngot\n%v", s.expected, str)
@@ -143,7 +143,7 @@ func TestNewForbiddenError(t *testing.T) {
 	for i, s := range scenarios {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			e := router.NewForbiddenError(s.message, s.data)
-			result, _ := json.Marshal(e)
+			result, _ := json.Marshal(e, json.Deterministic(true))
 
 			if str := string(result); str != s.expected {
 				t.Fatalf("Expected\n%v\ngot\n%v", s.expected, str)
@@ -168,7 +168,7 @@ func TestNewUnauthorizedError(t *testing.T) {
 	for i, s := range scenarios {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			e := router.NewUnauthorizedError(s.message, s.data)
-			result, _ := json.Marshal(e)
+			result, _ := json.Marshal(e, json.Deterministic(true))
 
 			if str := string(result); str != s.expected {
 				t.Fatalf("Expected\n%v\ngot\n%v", s.expected, str)
@@ -193,7 +193,7 @@ func TestNewInternalServerError(t *testing.T) {
 	for i, s := range scenarios {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			e := router.NewInternalServerError(s.message, s.data)
-			result, _ := json.Marshal(e)
+			result, _ := json.Marshal(e, json.Deterministic(true))
 
 			if str := string(result); str != s.expected {
 				t.Fatalf("Expected\n%v\ngot\n%v", s.expected, str)
@@ -218,7 +218,7 @@ func TestNewTooManyRequestsError(t *testing.T) {
 	for i, s := range scenarios {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			e := router.NewTooManyRequestsError(s.message, s.data)
-			result, _ := json.Marshal(e)
+			result, _ := json.Marshal(e, json.Deterministic(true))
 
 			if str := string(result); str != s.expected {
 				t.Fatalf("Expected\n%v\ngot\n%v", s.expected, str)
@@ -321,7 +321,7 @@ func TestToApiError(t *testing.T) {
 
 	for _, s := range scenarios {
 		t.Run(s.name, func(t *testing.T) {
-			raw, err := json.Marshal(router.ToApiError(s.err))
+			raw, err := json.Marshal(router.ToApiError(s.err), json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/tools/router/event.go b/tools/router/event.go
index 88b03786..d0f30bb5 100644
--- a/tools/router/event.go
+++ b/tools/router/event.go
@@ -1,7 +1,8 @@
 package router
 
 import (
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"encoding/xml"
 	"errors"
 	"io"
@@ -192,7 +193,7 @@ func (e *Event) JSON(status int, data any) error {
 
 	// error response or no fields to pick
 	if rawFields == "" || status < 200 || status > 299 {
-		return json.NewEncoder(e.Response).Encode(data)
+		return json.MarshalWrite(e.Response, data)
 	}
 
 	// pick only the requested fields
@@ -201,7 +202,7 @@ func (e *Event) JSON(status int, data any) error {
 		return err
 	}
 
-	return json.NewEncoder(e.Response).Encode(modified)
+	return json.MarshalWrite(e.Response, modified)
 }
 
 // XML writes an XML response.
@@ -359,10 +360,23 @@ func (e *Event) BindBody(dst any) error {
 	contentType := e.Request.Header.Get(headerContentType)
 
 	if strings.HasPrefix(contentType, "application/json") {
-		dec := json.NewDecoder(e.Request.Body)
-		err := dec.Decode(dst)
+		// note: don't use json.UnmarshalRead because it perfoms an extra
+		// whitespace scanning which will trigger the auto reread and
+		// will start again from the beginning and causing an error
+		//
+		// (technically json.UnmarshalRead is the better option here but to make
+		// it work it will require extra interface or other mechanism to temp disable
+		// the auto reread functionality and this could be a footgun for middlewares
+		// that wraps the body so for now it is kept as it is and it should
+		// be similar to the old json.NewDecoder(e.Request.Body).Decode(dst))
+		dec := jsontext.NewDecoder(e.Request.Body)
+		err := json.UnmarshalDecode(dec, dst,
+			// minimize breaking changes with earlier version
+			// @todo remove with the "Stage 2" refactoring
+			json.MatchCaseInsensitiveNames(true),
+		)
 		if err == nil {
-			// manually call Reread because single call of json.Decoder.Decode()
+			// manually call Reread because single call of json.UnmarshalDecode
 			// doesn't ensure that the entire body is a valid json string
 			// and it is not guaranteed that it will reach EOF to trigger the reread reset
 			// (ex. in case of trailing spaces or invalid trailing parts like: `{"test":1},something`)
diff --git a/tools/router/event_test.go b/tools/router/event_test.go
index 8b929efe..1a76cd93 100644
--- a/tools/router/event_test.go
+++ b/tools/router/event_test.go
@@ -3,7 +3,7 @@ package router_test
 import (
 	"bytes"
 	"crypto/tls"
-	"encoding/json"
+	"encoding/json/v2"
 	"encoding/xml"
 	"errors"
 	"fmt"
@@ -328,7 +328,7 @@ func TestEventSetAllGetAll(t *testing.T) {
 		"a": 123,
 		"b": 456,
 	}
-	rawData, err := json.Marshal(data)
+	rawData, err := json.Marshal(data, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -340,7 +340,7 @@ func TestEventSetAllGetAll(t *testing.T) {
 	data["c"] = 789
 
 	result := event.GetAll()
-	rawResult, err := json.Marshal(result)
+	rawResult, err := json.Marshal(result, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -410,8 +410,8 @@ func TestEventHTML(t *testing.T) {
 
 func TestEventJSON(t *testing.T) {
 	body := map[string]any{"a": 123, "b": 456, "c": "test"}
-	expectedPickedBody := `{"a":123,"c":"test"}` + "\n"
-	expectedFullBody := `{"a":123,"b":456,"c":"test"}` + "\n"
+	expectedPickedBody := `{"a":123,"c":"test"}`
+	expectedFullBody := `{"a":123,"b":456,"c":"test"}`
 
 	scenarios := []testResponseWriteScenario[any]{
 		{
@@ -673,7 +673,7 @@ func TestEventFileFS(t *testing.T) {
 func TestEventError(t *testing.T) {
 	err := new(router.Event).Error(123, "message_test", map[string]any{"a": validation.Required, "b": "test"})
 
-	result, _ := json.Marshal(err)
+	result, _ := json.Marshal(err, json.Deterministic(true))
 	expected := `{"data":{"a":{"code":"validation_invalid_value","message":"Invalid value."},"b":{"code":"validation_invalid_value","message":"Invalid value."}},"message":"Message_test.","status":123}`
 
 	if string(result) != expected {
@@ -684,7 +684,7 @@ func TestEventError(t *testing.T) {
 func TestEventBadRequestError(t *testing.T) {
 	err := new(router.Event).BadRequestError("message_test", map[string]any{"a": validation.Required, "b": "test"})
 
-	result, _ := json.Marshal(err)
+	result, _ := json.Marshal(err, json.Deterministic(true))
 	expected := `{"data":{"a":{"code":"validation_invalid_value","message":"Invalid value."},"b":{"code":"validation_invalid_value","message":"Invalid value."}},"message":"Message_test.","status":400}`
 
 	if string(result) != expected {
@@ -695,7 +695,7 @@ func TestEventBadRequestError(t *testing.T) {
 func TestEventNotFoundError(t *testing.T) {
 	err := new(router.Event).NotFoundError("message_test", map[string]any{"a": validation.Required, "b": "test"})
 
-	result, _ := json.Marshal(err)
+	result, _ := json.Marshal(err, json.Deterministic(true))
 	expected := `{"data":{"a":{"code":"validation_invalid_value","message":"Invalid value."},"b":{"code":"validation_invalid_value","message":"Invalid value."}},"message":"Message_test.","status":404}`
 
 	if string(result) != expected {
@@ -706,7 +706,7 @@ func TestEventNotFoundError(t *testing.T) {
 func TestEventForbiddenError(t *testing.T) {
 	err := new(router.Event).ForbiddenError("message_test", map[string]any{"a": validation.Required, "b": "test"})
 
-	result, _ := json.Marshal(err)
+	result, _ := json.Marshal(err, json.Deterministic(true))
 	expected := `{"data":{"a":{"code":"validation_invalid_value","message":"Invalid value."},"b":{"code":"validation_invalid_value","message":"Invalid value."}},"message":"Message_test.","status":403}`
 
 	if string(result) != expected {
@@ -717,7 +717,7 @@ func TestEventForbiddenError(t *testing.T) {
 func TestEventUnauthorizedError(t *testing.T) {
 	err := new(router.Event).UnauthorizedError("message_test", map[string]any{"a": validation.Required, "b": "test"})
 
-	result, _ := json.Marshal(err)
+	result, _ := json.Marshal(err, json.Deterministic(true))
 	expected := `{"data":{"a":{"code":"validation_invalid_value","message":"Invalid value."},"b":{"code":"validation_invalid_value","message":"Invalid value."}},"message":"Message_test.","status":401}`
 
 	if string(result) != expected {
@@ -728,7 +728,7 @@ func TestEventUnauthorizedError(t *testing.T) {
 func TestEventTooManyRequestsError(t *testing.T) {
 	err := new(router.Event).TooManyRequestsError("message_test", map[string]any{"a": validation.Required, "b": "test"})
 
-	result, _ := json.Marshal(err)
+	result, _ := json.Marshal(err, json.Deterministic(true))
 	expected := `{"data":{"a":{"code":"validation_invalid_value","message":"Invalid value."},"b":{"code":"validation_invalid_value","message":"Invalid value."}},"message":"Message_test.","status":429}`
 
 	if string(result) != expected {
@@ -739,7 +739,7 @@ func TestEventTooManyRequestsError(t *testing.T) {
 func TestEventInternalServerError(t *testing.T) {
 	err := new(router.Event).InternalServerError("message_test", map[string]any{"a": validation.Required, "b": "test"})
 
-	result, _ := json.Marshal(err)
+	result, _ := json.Marshal(err, json.Deterministic(true))
 	expected := `{"data":{"a":{"code":"validation_invalid_value","message":"Invalid value."},"b":{"code":"validation_invalid_value","message":"Invalid value."}},"message":"Message_test.","status":500}`
 
 	if string(result) != expected {
@@ -873,7 +873,7 @@ func TestEventBindBody(t *testing.T) {
 				t.Fatalf("Expected hasErr %v, got %v (%v)", s.expectError, hasErr, err)
 			}
 
-			dstRaw, err := json.Marshal(dst)
+			dstRaw, err := json.Marshal(dst, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -925,29 +925,32 @@ func testEventResponseWrite[T any](
 		}
 
 		result := rec.Result()
+		defer result.Body.Close()
 
 		if result.StatusCode != scenario.expectedStatus {
 			t.Fatalf("Expected status code %d, got %d", scenario.expectedStatus, result.StatusCode)
 		}
 
-		resultBody, err := io.ReadAll(result.Body)
-		result.Body.Close()
+		rawBody, err := io.ReadAll(result.Body)
 		if err != nil {
 			t.Fatalf("Failed to read response body: %v", err)
 		}
+		strBody := string(rawBody)
 
-		resultBody, err = json.Marshal(string(resultBody))
-		if err != nil {
-			t.Fatal(err)
+		// try to deserialize into a map and then serialize again in a
+		// deterministic manner in case it is json
+		var jsonBody any
+		err = json.Unmarshal(rawBody, &jsonBody)
+		if err == nil {
+			normalized, err := json.Marshal(jsonBody, json.Deterministic(true))
+			if err != nil {
+				t.Fatalf("Failed to deterministicly serialize json body\n%s\ngot\n%v", jsonBody, err)
+			}
+			strBody = string(normalized)
 		}
 
-		expectedBody, err := json.Marshal(scenario.expectedBody)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if !bytes.Equal(resultBody, expectedBody) {
-			t.Fatalf("Expected body\n%s\ngot\n%s", expectedBody, resultBody)
+		if scenario.expectedBody != strBody {
+			t.Fatalf("Expected body\n%s\ngot\n%s", scenario.expectedBody, strBody)
 		}
 
 		for k, ev := range scenario.expectedHeaders {
diff --git a/tools/router/router.go b/tools/router/router.go
index c2c35ddd..77c935e8 100644
--- a/tools/router/router.go
+++ b/tools/router/router.go
@@ -2,7 +2,7 @@ package router
 
 import (
 	"bufio"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"io"
 	"log"
@@ -176,7 +176,9 @@ func ErrorHandler(resp http.ResponseWriter, req *http.Request, err error) {
 	resp.WriteHeader(apiErr.Status)
 
 	if req.Method != http.MethodHead {
-		if jsonErr := json.NewEncoder(resp).Encode(apiErr); jsonErr != nil {
+		// note: deterministic because some logs may depend on the exact serialized error
+		jsonErr := json.MarshalWrite(resp, apiErr, json.Deterministic(true))
+		if jsonErr != nil {
 			log.Println(jsonErr) // truly rare case, log to stderr only for dev purposes
 		}
 	}
diff --git a/tools/router/unmarshal_request_data.go b/tools/router/unmarshal_request_data.go
index 099a915d..04e84738 100644
--- a/tools/router/unmarshal_request_data.go
+++ b/tools/router/unmarshal_request_data.go
@@ -2,7 +2,7 @@ package router
 
 import (
 	"encoding"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"reflect"
 	"regexp"
diff --git a/tools/router/unmarshal_request_data_test.go b/tools/router/unmarshal_request_data_test.go
index 797719a3..94d77bb6 100644
--- a/tools/router/unmarshal_request_data_test.go
+++ b/tools/router/unmarshal_request_data_test.go
@@ -2,7 +2,7 @@ package router_test
 
 import (
 	"bytes"
-	"encoding/json"
+	"encoding/json/v2"
 	"testing"
 	"time"
 
@@ -428,7 +428,7 @@ func TestUnmarshalRequestData(t *testing.T) {
 				return
 			}
 
-			raw, err := json.Marshal(s.dst)
+			raw, err := json.Marshal(s.dst, json.Deterministic(true))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/tools/search/filter.go b/tools/search/filter.go
index 8df74a95..48983bb8 100644
--- a/tools/search/filter.go
+++ b/tools/search/filter.go
@@ -1,7 +1,7 @@
 package search
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"strconv"
@@ -69,7 +69,7 @@ func (f FilterData) BuildExprWithLimit(
 
 				// try to json serialize as fallback
 				if replacement == "" {
-					raw, _ := json.Marshal(v)
+					raw, _ := json.Marshal(v, json.Deterministic(true))
 					replacement = string(raw)
 				}
 
diff --git a/tools/search/multi_match_subquery_test.go b/tools/search/multi_match_subquery_test.go
index 6caae968..f24564d4 100644
--- a/tools/search/multi_match_subquery_test.go
+++ b/tools/search/multi_match_subquery_test.go
@@ -3,7 +3,7 @@ package search_test
 import (
 	"bytes"
 	"database/sql"
-	"encoding/json"
+	"encoding/json/v2"
 	"testing"
 
 	"github.com/pocketbase/dbx"
@@ -40,7 +40,7 @@ func TestMultiMatchSubqueryBuild(t *testing.T) {
 	}
 
 	// the params from all expressions should be merged in the root
-	rawParams, err := json.Marshal(params)
+	rawParams, err := json.Marshal(params, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tools/search/provider_test.go b/tools/search/provider_test.go
index fc73a4df..f654f0fc 100644
--- a/tools/search/provider_test.go
+++ b/tools/search/provider_test.go
@@ -3,7 +3,7 @@ package search
 import (
 	"context"
 	"database/sql"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 	"fmt"
 	"strconv"
@@ -138,7 +138,7 @@ func TestProviderSort(t *testing.T) {
 		Sort(initialSort).
 		AddSort(SortField{"test3", SortDesc})
 
-	encoded, _ := json.Marshal(p.sort)
+	encoded, _ := json.Marshal(p.sort, json.Deterministic(true))
 	expected := `[{"name":"test1","direction":"ASC"},{"name":"test2","direction":"ASC"},{"name":"test3","direction":"DESC"}]`
 
 	if string(encoded) != expected {
@@ -153,7 +153,7 @@ func TestProviderFilter(t *testing.T) {
 		Filter(initialFilter).
 		AddFilter("test3")
 
-	encoded, _ := json.Marshal(p.filter)
+	encoded, _ := json.Marshal(p.filter, json.Deterministic(true))
 	expected := `["test1","test2","test3"]`
 
 	if string(encoded) != expected {
@@ -246,12 +246,12 @@ func TestProviderParse(t *testing.T) {
 				t.Fatalf("Expected perPage %v, got %v", s.expectPerPage, p.perPage)
 			}
 
-			encodedSort, _ := json.Marshal(p.sort)
+			encodedSort, _ := json.Marshal(p.sort, json.Deterministic(true))
 			if string(encodedSort) != s.expectSort {
 				t.Fatalf("Expected sort %v, got \n%v", s.expectSort, string(encodedSort))
 			}
 
-			encodedFilter, _ := json.Marshal(p.filter)
+			encodedFilter, _ := json.Marshal(p.filter, json.Deterministic(true))
 			if string(encodedFilter) != s.expectFilter {
 				t.Fatalf("Expected filter %v, got \n%v", s.expectFilter, string(encodedFilter))
 			}
@@ -453,7 +453,7 @@ func TestProviderExecNonEmptyQuery(t *testing.T) {
 				t.Fatalf("Expected resolver.Update to be called %d, got %d", 1, testResolver.UpdateQueryCalls)
 			}
 
-			encoded, _ := json.Marshal(result)
+			encoded, _ := json.Marshal(result, json.Deterministic(true))
 			if string(encoded) != s.expectResult {
 				t.Fatalf("Expected result %v, got \n%v", s.expectResult, string(encoded))
 			}
@@ -722,7 +722,7 @@ func TestProviderParseAndExec(t *testing.T) {
 				t.Fatalf("Expected %d db queries, got %d: \n%v", expectedQueries, len(testDB.CalledQueries), testDB.CalledQueries)
 			}
 
-			encoded, _ := json.Marshal(result)
+			encoded, _ := json.Marshal(result, json.Deterministic(true))
 			if string(encoded) != s.expectResult {
 				t.Fatalf("Expected result \n%v\ngot\n%v", s.expectResult, string(encoded))
 			}
diff --git a/tools/search/sort_test.go b/tools/search/sort_test.go
index 1c23cc45..e47ad6cb 100644
--- a/tools/search/sort_test.go
+++ b/tools/search/sort_test.go
@@ -1,7 +1,7 @@
 package search_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"testing"
 
@@ -67,7 +67,7 @@ func TestParseSortFromString(t *testing.T) {
 	for _, s := range scenarios {
 		t.Run(s.value, func(t *testing.T) {
 			result := search.ParseSortFromString(s.value)
-			encoded, _ := json.Marshal(result)
+			encoded, _ := json.Marshal(result, json.Deterministic(true))
 			encodedStr := string(encoded)
 
 			if encodedStr != s.expected {
diff --git a/tools/store/store.go b/tools/store/store.go
index bdb5d96a..087a6c39 100644
--- a/tools/store/store.go
+++ b/tools/store/store.go
@@ -1,7 +1,7 @@
 package store
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"sync"
 )
 
diff --git a/tools/store/store_test.go b/tools/store/store_test.go
index 24f28741..8d9b88de 100644
--- a/tools/store/store_test.go
+++ b/tools/store/store_test.go
@@ -2,7 +2,7 @@ package store_test
 
 import (
 	"bytes"
-	"encoding/json"
+	"encoding/json/v2"
 	"slices"
 	"strconv"
 	"testing"
@@ -12,7 +12,7 @@ import (
 
 func TestNew(t *testing.T) {
 	data := map[string]int{"test1": 1, "test2": 2}
-	originalRawData, err := json.Marshal(data)
+	originalRawData, err := json.Marshal(data, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -22,7 +22,7 @@ func TestNew(t *testing.T) {
 	s.Remove("test1") // remove 1 item
 
 	// check if data was shallow copied
-	rawData, _ := json.Marshal(data)
+	rawData, _ := json.Marshal(data, json.Deterministic(true))
 	if !bytes.Equal(originalRawData, rawData) {
 		t.Fatalf("Expected data \n%s, \ngot \n%s", originalRawData, rawData)
 	}
@@ -44,7 +44,7 @@ func TestReset(t *testing.T) {
 	s := store.New(map[string]int{"test1": 1})
 
 	data := map[string]int{"test2": 2}
-	originalRawData, err := json.Marshal(data)
+	originalRawData, err := json.Marshal(data, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -53,7 +53,7 @@ func TestReset(t *testing.T) {
 	s.Set("test3", 3)
 
 	// check if data was shallow copied
-	rawData, _ := json.Marshal(data)
+	rawData, _ := json.Marshal(data, json.Deterministic(true))
 	if !bytes.Equal(originalRawData, rawData) {
 		t.Fatalf("Expected data \n%s, \ngot \n%s", originalRawData, rawData)
 	}
@@ -371,7 +371,7 @@ func TestMarshalJSON(t *testing.T) {
 
 	expected := []byte(`{"a":"test1", "b":"test2"}`)
 
-	result, err := json.Marshal(s)
+	result, err := json.Marshal(s, json.Deterministic(true))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tools/subscriptions/client.go b/tools/subscriptions/client.go
index 06309d54..3bff8018 100644
--- a/tools/subscriptions/client.go
+++ b/tools/subscriptions/client.go
@@ -1,7 +1,7 @@
 package subscriptions
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"net/url"
 	"strings"
 	"sync"
diff --git a/tools/subscriptions/client_test.go b/tools/subscriptions/client_test.go
index ff5b59b7..eec6b817 100644
--- a/tools/subscriptions/client_test.go
+++ b/tools/subscriptions/client_test.go
@@ -1,7 +1,7 @@
 package subscriptions_test
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"strings"
 	"sync"
 	"testing"
diff --git a/tools/types/datetime.go b/tools/types/datetime.go
index 26820391..b302e994 100644
--- a/tools/types/datetime.go
+++ b/tools/types/datetime.go
@@ -2,7 +2,7 @@ package types
 
 import (
 	"database/sql/driver"
-	"encoding/json"
+	"encoding/json/v2"
 	"time"
 
 	"github.com/spf13/cast"
diff --git a/tools/types/geo_point.go b/tools/types/geo_point.go
index 286120d0..bbe3a7b9 100644
--- a/tools/types/geo_point.go
+++ b/tools/types/geo_point.go
@@ -2,7 +2,7 @@ package types
 
 import (
 	"database/sql/driver"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 )
 
diff --git a/tools/types/json_array.go b/tools/types/json_array.go
index 024fd7b0..a7749a9f 100644
--- a/tools/types/json_array.go
+++ b/tools/types/json_array.go
@@ -2,7 +2,7 @@ package types
 
 import (
 	"database/sql/driver"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 )
 
@@ -14,12 +14,9 @@ type jsonArrayAlias[T any] JSONArray[T]
 
 // MarshalJSON implements the [json.Marshaler] interface.
 func (m JSONArray[T]) MarshalJSON() ([]byte, error) {
-	// initialize an empty map to ensure that `[]` is returned as json
-	if m == nil {
-		m = JSONArray[T]{}
-	}
-
-	return json.Marshal(jsonArrayAlias[T](m))
+	// note: forces the Deterministic option to ensure consistent output
+	// in mixed json v1 and v2 configurations
+	return json.Marshal(jsonArrayAlias[T](m), json.Deterministic(true))
 }
 
 // String returns the string representation of the current json array.
@@ -30,8 +27,7 @@ func (m JSONArray[T]) String() string {
 
 // Value implements the [driver.Valuer] interface.
 func (m JSONArray[T]) Value() (driver.Value, error) {
-	data, err := json.Marshal(m)
-
+	data, err := m.MarshalJSON()
 	return string(data), err
 }
 
@@ -54,5 +50,12 @@ func (m *JSONArray[T]) Scan(value any) error {
 		data = []byte("[]")
 	}
 
-	return json.Unmarshal(data, m)
+	err := json.Unmarshal(data, m)
+	if err != nil {
+		// reset because jsonv2 performs streaming decoding and mutates the dst even on error
+		*m = JSONArray[T]{}
+		return err
+	}
+
+	return nil
 }
diff --git a/tools/types/json_array_test.go b/tools/types/json_array_test.go
index 27aa16fe..8527e083 100644
--- a/tools/types/json_array_test.go
+++ b/tools/types/json_array_test.go
@@ -2,7 +2,7 @@ package types_test
 
 import (
 	"database/sql/driver"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"testing"
 
@@ -115,7 +115,7 @@ func TestJSONArrayScan(t *testing.T) {
 			continue
 		}
 
-		result, _ := arr.MarshalJSON()
+		result, _ := json.Marshal(arr, json.Deterministic(true))
 
 		if string(result) != s.expectJSON {
 			t.Errorf("(%d) Expected %s, got %v", i, s.expectJSON, string(result))
diff --git a/tools/types/json_map.go b/tools/types/json_map.go
index 87b0fc84..f51eeeaa 100644
--- a/tools/types/json_map.go
+++ b/tools/types/json_map.go
@@ -2,31 +2,13 @@ package types
 
 import (
 	"database/sql/driver"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 )
 
 // JSONMap defines a map that is safe for json and db read/write.
 type JSONMap[T any] map[string]T
 
-// MarshalJSON implements the [json.Marshaler] interface.
-func (m JSONMap[T]) MarshalJSON() ([]byte, error) {
-	type alias JSONMap[T] // prevent recursion
-
-	// initialize an empty map to ensure that `{}` is returned as json
-	if m == nil {
-		m = JSONMap[T]{}
-	}
-
-	return json.Marshal(alias(m))
-}
-
-// String returns the string representation of the current json map.
-func (m JSONMap[T]) String() string {
-	v, _ := m.MarshalJSON()
-	return string(v)
-}
-
 // Get retrieves a single value from the current JSONMap[T].
 //
 // This helper was added primarily to assist the goja integration since custom map types
@@ -43,10 +25,24 @@ func (m JSONMap[T]) Set(key string, value T) {
 	m[key] = value
 }
 
+// MarshalJSON implements the [json.Marshaler] interface.
+func (m JSONMap[T]) MarshalJSON() ([]byte, error) {
+	type alias JSONMap[T] // prevent recursion
+
+	// note: forces the Deterministic option to ensure consistent output
+	// in mixed json v1 and v2 configurations
+	return json.Marshal(alias(m), json.Deterministic(true))
+}
+
+// String returns the string representation of the current json map.
+func (m JSONMap[T]) String() string {
+	v, _ := m.MarshalJSON()
+	return string(v)
+}
+
 // Value implements the [driver.Valuer] interface.
 func (m JSONMap[T]) Value() (driver.Value, error) {
-	data, err := json.Marshal(m)
-
+	data, err := m.MarshalJSON()
 	return string(data), err
 }
 
@@ -69,5 +65,12 @@ func (m *JSONMap[T]) Scan(value any) error {
 		data = []byte("{}")
 	}
 
-	return json.Unmarshal(data, m)
+	err := json.Unmarshal(data, m)
+	if err != nil {
+		// reset because jsonv2 performs streaming decoding and mutates the dst even on error
+		*m = JSONMap[T]{}
+		return err
+	}
+
+	return nil
 }
diff --git a/tools/types/json_map_test.go b/tools/types/json_map_test.go
index 56ea95aa..eab4b949 100644
--- a/tools/types/json_map_test.go
+++ b/tools/types/json_map_test.go
@@ -2,6 +2,7 @@ package types_test
 
 import (
 	"database/sql/driver"
+	"encoding/json/v2"
 	"fmt"
 	"testing"
 
@@ -154,7 +155,7 @@ func TestJSONArrayMapScan(t *testing.T) {
 				t.Fatalf("Expected %v, got %v (%v)", s.expectError, hasErr, scanErr)
 			}
 
-			result, _ := arr.MarshalJSON()
+			result, _ := json.Marshal(arr, json.Deterministic(true))
 
 			if string(result) != s.expectJSON {
 				t.Fatalf("Expected %s, got %s", s.expectJSON, result)
diff --git a/tools/types/json_raw.go b/tools/types/json_raw.go
index 8ed58c2a..2eb9cdaa 100644
--- a/tools/types/json_raw.go
+++ b/tools/types/json_raw.go
@@ -2,7 +2,7 @@ package types
 
 import (
 	"database/sql/driver"
-	"encoding/json"
+	"encoding/json/v2"
 	"errors"
 )