diff --git a/database/sql/organizations.go b/database/sql/organizations.go
index 21e02706..bb61070d 100644
--- a/database/sql/organizations.go
+++ b/database/sql/organizations.go
@@ -156,15 +156,16 @@ func (s *sqlDatabase) CreateOrganizationPool(ctx context.Context, orgId string,
 	}
 
 	newPool := Pool{
-		ProviderName:   param.ProviderName,
-		MaxRunners:     param.MaxRunners,
-		MinIdleRunners: param.MinIdleRunners,
-		Image:          param.Image,
-		Flavor:         param.Flavor,
-		OSType:         param.OSType,
-		OSArch:         param.OSArch,
-		OrgID:          org.ID,
-		Enabled:        param.Enabled,
+		ProviderName:           param.ProviderName,
+		MaxRunners:             param.MaxRunners,
+		MinIdleRunners:         param.MinIdleRunners,
+		Image:                  param.Image,
+		Flavor:                 param.Flavor,
+		OSType:                 param.OSType,
+		OSArch:                 param.OSArch,
+		OrgID:                  org.ID,
+		Enabled:                param.Enabled,
+		RunnerBootstrapTimeout: param.RunnerBootstrapTimeout,
 	}
 
 	_, err = s.getOrgPoolByUniqueFields(ctx, orgId, newPool.ProviderName, newPool.Image, newPool.Flavor)
diff --git a/database/sql/repositories.go b/database/sql/repositories.go
index 70592d8e..48cfe9a4 100644
--- a/database/sql/repositories.go
+++ b/database/sql/repositories.go
@@ -164,15 +164,16 @@ func (s *sqlDatabase) CreateRepositoryPool(ctx context.Context, repoId string, p
 	}
 
 	newPool := Pool{
-		ProviderName:   param.ProviderName,
-		MaxRunners:     param.MaxRunners,
-		MinIdleRunners: param.MinIdleRunners,
-		Image:          param.Image,
-		Flavor:         param.Flavor,
-		OSType:         param.OSType,
-		OSArch:         param.OSArch,
-		RepoID:         repo.ID,
-		Enabled:        param.Enabled,
+		ProviderName:           param.ProviderName,
+		MaxRunners:             param.MaxRunners,
+		MinIdleRunners:         param.MinIdleRunners,
+		Image:                  param.Image,
+		Flavor:                 param.Flavor,
+		OSType:                 param.OSType,
+		OSArch:                 param.OSArch,
+		RepoID:                 repo.ID,
+		Enabled:                param.Enabled,
+		RunnerBootstrapTimeout: param.RunnerBootstrapTimeout,
 	}
 
 	_, err = s.getRepoPoolByUniqueFields(ctx, repoId, newPool.ProviderName, newPool.Image, newPool.Flavor)
diff --git a/runner/repositories.go b/runner/repositories.go
index 63387ef8..f8634439 100644
--- a/runner/repositories.go
+++ b/runner/repositories.go
@@ -203,8 +203,8 @@ func (r *Runner) CreateRepoPool(ctx context.Context, repoID string, param params
 		return params.Pool{}, errors.Wrap(err, "fetching pool params")
 	}
 
-	if param.RunnerBootstrapTimeout == 0 {
-		param.RunnerBootstrapTimeout = config.DefaultRunnerBootstrapTimeout
+	if createPoolParams.RunnerBootstrapTimeout == 0 {
+		createPoolParams.RunnerBootstrapTimeout = config.DefaultRunnerBootstrapTimeout
 	}
 
 	pool, err := r.store.CreateRepositoryPool(ctx, repoID, createPoolParams)