diff --git a/.github/workflows/systest.yml b/.github/workflows/systest.yml
index dfd15b59e5a..86d38aeacca 100644
--- a/.github/workflows/systest.yml
+++ b/.github/workflows/systest.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       test_name:
         description: "Test to run"
-        default: "."
+        default: "TestCheckpoint"
       log_level:
         description: "Log level"
         default: "debug"
diff --git a/cmd/bootstrapper/server.go b/cmd/bootstrapper/server.go
index 5f9986ffb23..1f2834a0a1e 100644
--- a/cmd/bootstrapper/server.go
+++ b/cmd/bootstrapper/server.go
@@ -134,8 +134,37 @@ func (s *Server) Start(ctx context.Context, errCh chan error, params *NetworkPar
 		// start generating fallback data
 		s.eg.Go(
 			func() error {
-				s.genDataLoop(ctx, errCh, last, params.updateActiveSetTime, s.GenFallbackActiveSet)
-				return nil
+				var (
+					errs    = 0
+					maxErrs = 10
+					timer   *time.Timer
+					backoff = 10 * time.Second
+				)
+				for epoch := last; ; epoch++ {
+					wait := time.Until(params.updateActiveSetTime(epoch))
+					select {
+					case <-timer.C:
+						if err := s.GenFallbackActiveSet(ctx, epoch); err != nil {
+							errs++
+							timer.Reset(backoff)
+							continue
+						}
+						errs = 0
+						if !timer.Stop() {
+							<-timer.C
+						}
+					case <-time.After(wait):
+						if err := s.GenFallbackActiveSet(ctx, epoch); err != nil {
+							timer = time.NewTimer(backoff)
+							if errs >= maxErrs {
+								errCh <- err
+								return err
+							}
+						}
+					case <-ctx.Done():
+						return ctx.Err()
+					}
+				}
 			})
 		s.eg.Go(
 			func() error {