diff --git a/database/sql/enterprise_test.go b/database/sql/enterprise_test.go
index bbedcf29..a01b0399 100644
--- a/database/sql/enterprise_test.go
+++ b/database/sql/enterprise_test.go
@@ -354,7 +354,7 @@ func (s *EnterpriseTestSuite) TestUpdateEnterpriseDBSaveErr() {
 
 func (s *EnterpriseTestSuite) TestUpdateEnterpriseDBDecryptingErr() {
 	s.StoreSQLMocked.cfg.Passphrase = "wrong-passphrase"
-	s.Fixtures.UpdateRepoParams.WebhookSecret = "some-webhook-secret"
+	s.Fixtures.UpdateRepoParams.WebhookSecret = "webhook-secret"
 
 	s.Fixtures.SQLMock.
 		ExpectQuery(regexp.QuoteMeta("SELECT * FROM `enterprises` WHERE id = ? AND `enterprises`.`deleted_at` IS NULL ORDER BY `enterprises`.`id` LIMIT 1")).
diff --git a/database/sql/organizations_test.go b/database/sql/organizations_test.go
index 8f3154ea..35aa4417 100644
--- a/database/sql/organizations_test.go
+++ b/database/sql/organizations_test.go
@@ -354,7 +354,7 @@ func (s *OrgTestSuite) TestUpdateOrganizationDBSaveErr() {
 
 func (s *OrgTestSuite) TestUpdateOrganizationDBDecryptingErr() {
 	s.StoreSQLMocked.cfg.Passphrase = "wrong-passphrase"
-	s.Fixtures.UpdateRepoParams.WebhookSecret = "some-webhook-secret"
+	s.Fixtures.UpdateRepoParams.WebhookSecret = "webhook-secret"
 
 	s.Fixtures.SQLMock.
 		ExpectQuery(regexp.QuoteMeta("SELECT * FROM `organizations` WHERE id = ? AND `organizations`.`deleted_at` IS NULL ORDER BY `organizations`.`id` LIMIT 1")).
diff --git a/database/sql/repositories_test.go b/database/sql/repositories_test.go
index f02497d3..65af2181 100644
--- a/database/sql/repositories_test.go
+++ b/database/sql/repositories_test.go
@@ -392,7 +392,7 @@ func (s *RepoTestSuite) TestUpdateRepositoryDBSaveErr() {
 
 func (s *RepoTestSuite) TestUpdateRepositoryDBDecryptingErr() {
 	s.StoreSQLMocked.cfg.Passphrase = "wrong-passphrase"
-	s.Fixtures.UpdateRepoParams.WebhookSecret = "some-webhook-secret"
+	s.Fixtures.UpdateRepoParams.WebhookSecret = "webhook-secret"
 
 	s.Fixtures.SQLMock.
 		ExpectQuery(regexp.QuoteMeta("SELECT * FROM `repositories` WHERE id = ? AND `repositories`.`deleted_at` IS NULL ORDER BY `repositories`.`id` LIMIT 1")).
diff --git a/runner/enterprises_test.go b/runner/enterprises_test.go
index 86591e77..688596b3 100644
--- a/runner/enterprises_test.go
+++ b/runner/enterprises_test.go
@@ -17,6 +17,8 @@ package runner
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"garm/auth"
 	"garm/config"
 	"garm/database"
@@ -27,7 +29,6 @@ import (
 	"garm/runner/common"
 	runnerCommonMocks "garm/runner/common/mocks"
 	runnerMocks "garm/runner/mocks"
-	"testing"
 
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
@@ -106,6 +107,7 @@ func (s *EnterpriseTestSuite) SetupTest() {
 		CreateEnterpriseParams: params.CreateEnterpriseParams{
 			Name:            "test-enterprise-create",
 			CredentialsName: "test-creds",
+			WebhookSecret:   "test-create-enterprise-webhook-secret",
 		},
 		CreatePoolParams: params.CreatePoolParams{
 			ProviderName:           "test-provider",
diff --git a/runner/organizations_test.go b/runner/organizations_test.go
index b8a7ef48..683fa609 100644
--- a/runner/organizations_test.go
+++ b/runner/organizations_test.go
@@ -17,6 +17,8 @@ package runner
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"garm/auth"
 	"garm/config"
 	"garm/database"
@@ -27,7 +29,6 @@ import (
 	"garm/runner/common"
 	runnerCommonMocks "garm/runner/common/mocks"
 	runnerMocks "garm/runner/mocks"
-	"testing"
 
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
@@ -106,6 +107,7 @@ func (s *OrgTestSuite) SetupTest() {
 		CreateOrgParams: params.CreateOrgParams{
 			Name:            "test-org-create",
 			CredentialsName: "test-creds",
+			WebhookSecret:   "test-create-org-webhook-secret",
 		},
 		CreatePoolParams: params.CreatePoolParams{
 			ProviderName:           "test-provider",
diff --git a/runner/repositories_test.go b/runner/repositories_test.go
index e372f6dd..1e924832 100644
--- a/runner/repositories_test.go
+++ b/runner/repositories_test.go
@@ -17,6 +17,8 @@ package runner
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"garm/auth"
 	"garm/config"
 	"garm/database"
@@ -27,7 +29,6 @@ import (
 	"garm/runner/common"
 	runnerCommonMocks "garm/runner/common/mocks"
 	runnerMocks "garm/runner/mocks"
-	"testing"
 
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
@@ -106,6 +107,7 @@ func (s *RepoTestSuite) SetupTest() {
 			Owner:           "test-owner-create",
 			Name:            "test-repo-create",
 			CredentialsName: "test-creds",
+			WebhookSecret:   "test-create-repo-webhook-secret",
 		},
 		CreatePoolParams: params.CreatePoolParams{
 			ProviderName:           "test-provider",
@@ -404,6 +406,7 @@ func (s *RepoTestSuite) TestGetRepoPoolByIDErrUnauthorized() {
 
 	s.Require().Equal(runnerErrors.ErrUnauthorized, err)
 }
+
 func (s *RepoTestSuite) TestDeleteRepoPool() {
 	pool, err := s.Fixtures.Store.CreateRepositoryPool(s.Fixtures.AdminContext, s.Fixtures.StoreRepos["test-repo-1"].ID, s.Fixtures.CreatePoolParams)
 	if err != nil {