diff --git a/cmd/report/report.go b/cmd/report/report.go
index efab23657..0a620de61 100644
--- a/cmd/report/report.go
+++ b/cmd/report/report.go
@@ -278,9 +278,7 @@ func generateReport(ctx context.Context, ec *ethrpc.Client, report *BlockReport,
 	// Start worker goroutines
 	var wg sync.WaitGroup
 	for range concurrency {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			for req := range blockChan {
 				// Check if worker context is canceled
 				if workerCtx.Err() != nil {
@@ -329,7 +327,7 @@ func generateReport(ctx context.Context, ec *ethrpc.Client, report *BlockReport,
 					close(retryChan) // No more retries needed
 				}
 			}
-		}()
+		})
 	}
 
 	// Monitor goroutine to close blockChan when all work is done
diff --git a/loadtest/gasmanager/gas_vault_test.go b/loadtest/gasmanager/gas_vault_test.go
index 0d9d10c1c..4b174559d 100644
--- a/loadtest/gasmanager/gas_vault_test.go
+++ b/loadtest/gasmanager/gas_vault_test.go
@@ -189,14 +189,12 @@ func TestGasVault_ConcurrentAccess(t *testing.T) {
 
 	// Spawn multiple goroutines trying to spend gas concurrently
 	for i := 0; i < numGoroutines; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			err := vault.SpendOrWaitAvailableBudget(ctx, spendAmount)
 			if err != nil {
 				errors <- err
 			}
-		}()
+		})
 	}
 
 	wg.Wait()
@@ -229,24 +227,20 @@ func TestGasVault_ConcurrentAddAndSpend(t *testing.T) {
 
 	// Adders
 	for i := 0; i < numAdders; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			vault.AddGas(addAmount)
-		}()
+		})
 	}
 
 	// Spenders
 	errors := make(chan error, numSpenders)
 	for i := 0; i < numSpenders; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			err := vault.SpendOrWaitAvailableBudget(ctx, spendAmount)
 			if err != nil {
 				errors <- err
 			}
-		}()
+		})
 	}
 
 	wg.Wait()
@@ -278,14 +272,12 @@ func TestGasVault_MultipleSpendersWaiting(t *testing.T) {
 
 	// Start multiple spenders that will all wait
 	for i := 0; i < numSpenders; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			err := vault.SpendOrWaitAvailableBudget(ctx, spendAmount)
 			if err == nil {
 				successCount <- 1
 			}
-		}()
+		})
 	}
 
 	// Give goroutines time to start waiting
diff --git a/loadtest/preconf.go b/loadtest/preconf.go
index 876ab1661..e2adf97e5 100644
--- a/loadtest/preconf.go
+++ b/loadtest/preconf.go
@@ -101,9 +101,7 @@ func (pt *PreconfTracker) Track(txHash common.Hash) {
 	var preconfStatus bool
 	var preconfError error
 	var preconfDuration time.Duration
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 
 		preconfStartTime := time.Now()
 		defer func() {
@@ -111,15 +109,13 @@ func (pt *PreconfTracker) Track(txHash common.Hash) {
 		}()
 
 		preconfStatus, preconfError = util.WaitPreconf(context.Background(), pt.client, txHash, time.Minute)
-	}()
+	})
 
 	// wait for receipt
 	var receipt *types.Receipt
 	var receiptError error
 	var receiptDuration time.Duration
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 
 		time.Sleep(100 * time.Millisecond)
 
@@ -129,7 +125,7 @@ func (pt *PreconfTracker) Track(txHash common.Hash) {
 		}()
 
 		receipt, receiptError = util.WaitReceiptWithTimeout(context.Background(), pt.client, txHash, time.Minute)
-	}()
+	})
 
 	wg.Wait()