diff --git a/api/chisel/service_test.go b/api/chisel/service_test.go
index 286463044..aa849a505 100644
--- a/api/chisel/service_test.go
+++ b/api/chisel/service_test.go
@@ -25,7 +25,7 @@ func TestPingAgentPanic(t *testing.T) {
 		UserTrusted: true,
 	}
 
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	s := NewService(store, nil, nil)
 
diff --git a/api/dataservices/customtemplate/customtemplate_test.go b/api/dataservices/customtemplate/customtemplate_test.go
index fed6083e7..09f60965c 100644
--- a/api/dataservices/customtemplate/customtemplate_test.go
+++ b/api/dataservices/customtemplate/customtemplate_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestCustomTemplateCreate(t *testing.T) {
-	_, ds := datastore.MustNewTestStore(t, true, false)
+	_, ds := datastore.MustNewTestStore(t, false, false)
 	require.NotNil(t, ds)
 
 	require.NoError(t, ds.CustomTemplate().Create(&portainer.CustomTemplate{ID: 1}))
diff --git a/api/dataservices/customtemplate/tx_test.go b/api/dataservices/customtemplate/tx_test.go
index 43afde3cd..7fd91b149 100644
--- a/api/dataservices/customtemplate/tx_test.go
+++ b/api/dataservices/customtemplate/tx_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestCustomTemplateCreateTx(t *testing.T) {
-	_, ds := datastore.MustNewTestStore(t, true, false)
+	_, ds := datastore.MustNewTestStore(t, false, false)
 	require.NotNil(t, ds)
 
 	require.NoError(t, ds.UpdateTx(func(tx dataservices.DataStoreTx) error {
diff --git a/api/dataservices/stack/tests/stack_test.go b/api/dataservices/stack/tests/stack_test.go
index 3409df951..5793d0c72 100644
--- a/api/dataservices/stack/tests/stack_test.go
+++ b/api/dataservices/stack/tests/stack_test.go
@@ -30,7 +30,7 @@ func TestService_StackByWebhookID(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping test in short mode. Normally takes ~1s to run.")
 	}
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	b := stackBuilder{t: t, store: store}
 	b.createNewStack(newGuidString(t))
@@ -87,7 +87,7 @@ func Test_RefreshableStacks(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping test in short mode. Normally takes ~1s to run.")
 	}
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	staticStack := portainer.Stack{ID: 1}
 	stackWithWebhook := portainer.Stack{ID: 2, AutoUpdate: &portainer.AutoUpdateSettings{Webhook: "webhook"}}
diff --git a/api/dataservices/team/tests/team_test.go b/api/dataservices/team/tests/team_test.go
index 1fa1de2c8..55d21a981 100644
--- a/api/dataservices/team/tests/team_test.go
+++ b/api/dataservices/team/tests/team_test.go
@@ -32,7 +32,7 @@ func (b *teamBuilder) createNew(name string) *portainer.Team {
 
 func Test_teamByName(t *testing.T) {
 	t.Run("When store is empty should return ErrObjectNotFound", func(t *testing.T) {
-		_, store := datastore.MustNewTestStore(t, true, true)
+		_, store := datastore.MustNewTestStore(t, false, true)
 
 		_, err := store.Team().TeamByName("name")
 		require.ErrorIs(t, err, errors.ErrObjectNotFound)
@@ -40,7 +40,7 @@ func Test_teamByName(t *testing.T) {
 	})
 
 	t.Run("When there is no object with the same name should return ErrObjectNotFound", func(t *testing.T) {
-		_, store := datastore.MustNewTestStore(t, true, true)
+		_, store := datastore.MustNewTestStore(t, false, true)
 
 		teamBuilder := teamBuilder{
 			t:     t,
@@ -55,7 +55,7 @@ func Test_teamByName(t *testing.T) {
 	})
 
 	t.Run("When there is an object with the same name should return the object", func(t *testing.T) {
-		_, store := datastore.MustNewTestStore(t, true, true)
+		_, store := datastore.MustNewTestStore(t, false, true)
 
 		teamBuilder := teamBuilder{
 			t:     t,
diff --git a/api/http/handler/docker/utils/get_stacks_test.go b/api/http/handler/docker/utils/get_stacks_test.go
index e6ab5f6cc..7a319a55b 100644
--- a/api/http/handler/docker/utils/get_stacks_test.go
+++ b/api/http/handler/docker/utils/get_stacks_test.go
@@ -58,7 +58,7 @@ func TestHandler_getDockerStacks(t *testing.T) {
 		Type:       portainer.DockerComposeStack,
 	}
 
-	ok, store := datastore.MustNewTestStore(t, true, false)
+	ok, store := datastore.MustNewTestStore(t, false, false)
 	is.True(ok)
 
 	is.NoError(store.UpdateTx(func(tx dataservices.DataStoreTx) error {
diff --git a/api/http/handler/edgegroups/edgegroup_create_test.go b/api/http/handler/edgegroups/edgegroup_create_test.go
index e8a370329..54a8190c6 100644
--- a/api/http/handler/edgegroups/edgegroup_create_test.go
+++ b/api/http/handler/edgegroups/edgegroup_create_test.go
@@ -16,7 +16,7 @@ import (
 )
 
 func TestEdgeGroupCreateHandler(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	handler := NewHandler(testhelpers.NewTestRequestBouncer())
 	handler.DataStore = store
@@ -62,7 +62,7 @@ func TestEdgeGroupCreateHandler(t *testing.T) {
 }
 
 func TestEdgeGroupCreatePanic(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	handler := NewHandler(testhelpers.NewTestRequestBouncer())
 	handler.DataStore = store
diff --git a/api/http/handler/edgegroups/edgegroup_inspect_test.go b/api/http/handler/edgegroups/edgegroup_inspect_test.go
index 5a1b6bcff..b25f074c6 100644
--- a/api/http/handler/edgegroups/edgegroup_inspect_test.go
+++ b/api/http/handler/edgegroups/edgegroup_inspect_test.go
@@ -17,7 +17,7 @@ import (
 )
 
 func TestEdgeGroupInspectHandler(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	handler := NewHandler(testhelpers.NewTestRequestBouncer())
 	handler.DataStore = store
@@ -70,7 +70,7 @@ func TestEdgeGroupInspectHandler(t *testing.T) {
 }
 
 func TestEmptyEdgeGroupInspectHandler(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	handler := NewHandler(testhelpers.NewTestRequestBouncer())
 	handler.DataStore = store
@@ -109,7 +109,7 @@ func TestEmptyEdgeGroupInspectHandler(t *testing.T) {
 }
 
 func TestDynamicEdgeGroupInspectHandler(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	handler := NewHandler(testhelpers.NewTestRequestBouncer())
 	handler.DataStore = store
@@ -176,7 +176,7 @@ func TestDynamicEdgeGroupInspectHandler(t *testing.T) {
 }
 
 func TestEdgeGroupInspectPanic(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	handler := NewHandler(testhelpers.NewTestRequestBouncer())
 	handler.DataStore = store
diff --git a/api/http/handler/edgegroups/edgegroup_list_test.go b/api/http/handler/edgegroups/edgegroup_list_test.go
index 662f1fcde..cf3cb54b6 100644
--- a/api/http/handler/edgegroups/edgegroup_list_test.go
+++ b/api/http/handler/edgegroups/edgegroup_list_test.go
@@ -61,7 +61,7 @@ func Test_getEndpointTypes_failWhenEndpointDontExist(t *testing.T) {
 }
 
 func TestEdgeGroupListHandler(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	handler := NewHandler(testhelpers.NewTestRequestBouncer())
 	handler.DataStore = store
diff --git a/api/http/handler/edgegroups/edgegroup_update_test.go b/api/http/handler/edgegroups/edgegroup_update_test.go
index 4dfa48e0e..9f2ac7a7c 100644
--- a/api/http/handler/edgegroups/edgegroup_update_test.go
+++ b/api/http/handler/edgegroups/edgegroup_update_test.go
@@ -17,7 +17,7 @@ import (
 )
 
 func TestEdgeGroupUpdateHandler(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	handler := NewHandler(testhelpers.NewTestRequestBouncer())
 	handler.DataStore = store
@@ -70,7 +70,7 @@ func TestEdgeGroupUpdateHandler(t *testing.T) {
 }
 
 func TestEdgeGroupUpdatePanic(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	handler := NewHandler(testhelpers.NewTestRequestBouncer())
 	handler.DataStore = store
diff --git a/api/http/handler/endpoints/endpoint_snapshots_test.go b/api/http/handler/endpoints/endpoint_snapshots_test.go
index 5e242f5d6..f4e5c0a93 100644
--- a/api/http/handler/endpoints/endpoint_snapshots_test.go
+++ b/api/http/handler/endpoints/endpoint_snapshots_test.go
@@ -18,7 +18,7 @@ import (
 )
 
 func Test_endpointSnapshots(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	endpointID := portainer.EndpointID(123)
 	endpoint := &portainer.Endpoint{
diff --git a/api/http/handler/endpoints/utils_update_edge_groups_test.go b/api/http/handler/endpoints/utils_update_edge_groups_test.go
index 3f9539307..e39215309 100644
--- a/api/http/handler/endpoints/utils_update_edge_groups_test.go
+++ b/api/http/handler/endpoints/utils_update_edge_groups_test.go
@@ -67,7 +67,7 @@ func Test_updateEdgeGroups(t *testing.T) {
 
 	testFn := func(t *testing.T, testCase testCase) {
 		is := assert.New(t)
-		_, store := datastore.MustNewTestStore(t, true, true)
+		_, store := datastore.MustNewTestStore(t, false, true)
 
 		err := store.Endpoint().Create(testCase.endpoint)
 		require.NoError(t, err)
diff --git a/api/http/handler/endpoints/utils_update_tags_test.go b/api/http/handler/endpoints/utils_update_tags_test.go
index d176a71dd..48ff42030 100644
--- a/api/http/handler/endpoints/utils_update_tags_test.go
+++ b/api/http/handler/endpoints/utils_update_tags_test.go
@@ -76,7 +76,7 @@ func Test_updateTags(t *testing.T) {
 
 	testFn := func(t *testing.T, testCase testCase) {
 		is := assert.New(t)
-		_, store := datastore.MustNewTestStore(t, true, true)
+		_, store := datastore.MustNewTestStore(t, false, true)
 
 		err := store.Endpoint().Create(testCase.endpoint)
 		require.NoError(t, err)
diff --git a/api/http/handler/registries/registry_access_test.go b/api/http/handler/registries/registry_access_test.go
index 2355c8bb7..e55411db4 100644
--- a/api/http/handler/registries/registry_access_test.go
+++ b/api/http/handler/registries/registry_access_test.go
@@ -16,7 +16,7 @@ import (
 )
 
 func Test_RegistryAccess_RequiresAuthentication(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 	registry := &portainer.Registry{
 		ID:   1,
 		Name: "test-registry",
@@ -37,7 +37,7 @@ func Test_RegistryAccess_RequiresAuthentication(t *testing.T) {
 }
 
 func Test_RegistryAccess_InvalidRegistryID(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 	user := &portainer.User{ID: 1, Username: "test", Role: portainer.StandardUserRole}
 	err := store.User().Create(user)
 	require.NoError(t, err)
@@ -57,7 +57,7 @@ func Test_RegistryAccess_InvalidRegistryID(t *testing.T) {
 }
 
 func Test_RegistryAccess_RegistryNotFound(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	user := &portainer.User{ID: 1, Username: "test", Role: portainer.StandardUserRole}
 	err := store.User().Create(user)
diff --git a/api/http/handler/stacks/stack_file_test.go b/api/http/handler/stacks/stack_file_test.go
index 24288778d..2f49bf06e 100644
--- a/api/http/handler/stacks/stack_file_test.go
+++ b/api/http/handler/stacks/stack_file_test.go
@@ -20,7 +20,7 @@ import (
 )
 
 func TestStackFile_GitPendingRedeploy_Returns409(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	_, err := mockCreateUser(store)
 	require.NoError(t, err)
@@ -63,7 +63,7 @@ func TestStackFile_GitPendingRedeploy_Returns409(t *testing.T) {
 }
 
 func TestStackFile_MatchingGitSettings_ReturnsFileContent(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	_, err := mockCreateUser(store)
 	require.NoError(t, err)
diff --git a/api/http/handler/stacks/stack_update_test.go b/api/http/handler/stacks/stack_update_test.go
index a0e5af04a..1901fcc49 100644
--- a/api/http/handler/stacks/stack_update_test.go
+++ b/api/http/handler/stacks/stack_update_test.go
@@ -198,7 +198,7 @@ func Test_updateStackInTx(t *testing.T) {
 
 func TestStackUpdate(t *testing.T) {
 	t.Helper()
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	testDataPath := filepath.Join(t.TempDir())
 	fileService, err := filesystem.NewService(testDataPath, "")
@@ -324,7 +324,7 @@ type testUpdateStackPayload interface {
 func setupUpdateStackInTxTest[T testUpdateStackPayload](t *testing.T, stack *portainer.Stack, payload T) *updateStackInTxTestSetup {
 	t.Helper()
 
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	testDataPath := filepath.Join(t.TempDir())
 	fileService, err := filesystem.NewService(testDataPath, "")
diff --git a/api/http/handler/stacks/webhook_invoke_test.go b/api/http/handler/stacks/webhook_invoke_test.go
index b9dc2a290..c67a61ed3 100644
--- a/api/http/handler/stacks/webhook_invoke_test.go
+++ b/api/http/handler/stacks/webhook_invoke_test.go
@@ -15,7 +15,7 @@ import (
 )
 
 func TestHandler_webhookInvoke(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	webhookID := newGuidString(t)
 	err := store.StackService.Create(&portainer.Stack{
diff --git a/api/stacks/deployments/deploy_test.go b/api/stacks/deployments/deploy_test.go
index fb8defb00..a6c4c2e44 100644
--- a/api/stacks/deployments/deploy_test.go
+++ b/api/stacks/deployments/deploy_test.go
@@ -157,7 +157,7 @@ func agentServer(t *testing.T) string {
 }
 
 func Test_redeployWhenChanged_FailsWhenCannotFindStack(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	err := RedeployWhenChanged(t.Context(), 1, nil, store, nil)
 	require.Error(t, err)
@@ -165,7 +165,7 @@ func Test_redeployWhenChanged_FailsWhenCannotFindStack(t *testing.T) {
 }
 
 func Test_redeployWhenChanged_DoesNothingWhenNotAGitBasedStack(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	admin := &portainer.User{ID: 1, Username: "admin"}
 	err := store.User().Create(admin)
@@ -179,7 +179,7 @@ func Test_redeployWhenChanged_DoesNothingWhenNotAGitBasedStack(t *testing.T) {
 }
 
 func Test_redeployWhenChanged_DoesNothingWhenNoGitChanges(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	tmpDir := t.TempDir()
 
@@ -211,7 +211,7 @@ func Test_redeployWhenChanged_FailsWhenCannotClone(t *testing.T) {
 	fips.InitFIPS(false)
 
 	cloneErr := errors.New("failed to clone")
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	admin := &portainer.User{ID: 1, Username: "admin"}
 	err := store.User().Create(admin)
@@ -243,7 +243,7 @@ func Test_redeployWhenChanged_FailsWhenCannotClone(t *testing.T) {
 }
 
 func Test_redeployWhenChanged(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	tmpDir := t.TempDir()
 
@@ -298,7 +298,7 @@ func Test_redeployWhenChanged(t *testing.T) {
 }
 
 func Test_getUserRegistries(t *testing.T) {
-	_, store := datastore.MustNewTestStore(t, true, true)
+	_, store := datastore.MustNewTestStore(t, false, true)
 
 	endpointID := 123