diff --git a/pkg/clients/github/repositories.go b/pkg/clients/github/repositories.go
index e59661c1e..3ec3f4655 100644
--- a/pkg/clients/github/repositories.go
+++ b/pkg/clients/github/repositories.go
@@ -196,7 +196,7 @@ func (g *Github) ForkRepository(sourceName, targetName string) (*github.Reposito
 			return false, fmt.Errorf("Error forking %s/%s: %v", g.organization, sourceName, err)
 		}
 		return true, nil
-	}, time.Second * 2, time.Minute * 30)
+	}, time.Second * 2, time.Minute * 5)
 	if err1 != nil {
 		return nil, fmt.Errorf("Failed waiting for repo %s/%s: %v", g.organization, sourceName, err1)
 	}
diff --git a/tests/load-tests/pkg/journey/handle_repo_templating.go b/tests/load-tests/pkg/journey/handle_repo_templating.go
index f32dcd384..bca74f9b0 100644
--- a/tests/load-tests/pkg/journey/handle_repo_templating.go
+++ b/tests/load-tests/pkg/journey/handle_repo_templating.go
@@ -94,7 +94,7 @@ func ForkRepo(f *framework.Framework, repoUrl, repoRevision, username string) (s
 			return false, nil
 		}
 		return true, nil
-	}, time.Second * 20, time.Minute * 60)
+	}, time.Second * 20, time.Minute * 10)
 	if err != nil {
 		return "", err
 	}