diff --git a/go/internal/feast/onlinestore/dynamodbonlinestore.go b/go/internal/feast/onlinestore/dynamodbonlinestore.go
index 0a8ccbc855d..e6d620ee10c 100644
--- a/go/internal/feast/onlinestore/dynamodbonlinestore.go
+++ b/go/internal/feast/onlinestore/dynamodbonlinestore.go
@@ -50,8 +50,7 @@ func NewDynamodbOnlineStore(project string, config *registry.RepoConfig, onlineS
 	}
 
 	// aws configuration
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
+	ctx := context.Background()
 	cfg, err := awsConfig.LoadDefaultConfig(ctx)
 	if err != nil {
 		panic(err)
diff --git a/go/internal/feast/registry/gcs.go b/go/internal/feast/registry/gcs.go
index 00968a55ae3..6d13a34e11d 100644
--- a/go/internal/feast/registry/gcs.go
+++ b/go/internal/feast/registry/gcs.go
@@ -42,8 +42,7 @@ type GCSRegistryStore struct {
 // NewGCSRegistryStore creates a GCSRegistryStore with the given configuration.
 func NewGCSRegistryStore(config *RegistryConfig, repoPath string) *GCSRegistryStore {
 	var rs GCSRegistryStore
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
+	ctx := context.Background()
 
 	client, err := storage.NewClient(ctx)
 	if err != nil {
diff --git a/go/internal/feast/registry/s3.go b/go/internal/feast/registry/s3.go
index 71ca8e2f135..c4e30f06077 100644
--- a/go/internal/feast/registry/s3.go
+++ b/go/internal/feast/registry/s3.go
@@ -29,22 +29,21 @@ type S3RegistryStore struct {
 
 // NewS3RegistryStore creates a S3RegistryStore with the given configuration
 func NewS3RegistryStore(config *RegistryConfig, repoPath string) *S3RegistryStore {
-	var lr S3RegistryStore
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
+	var rs S3RegistryStore
+	ctx := context.Background()
 
 	cfg, err := awsConfig.LoadDefaultConfig(ctx)
 	if err != nil {
-		lr = S3RegistryStore{
+		rs = S3RegistryStore{
 			filePath: config.Path,
 		}
 	} else {
-		lr = S3RegistryStore{
+		rs = S3RegistryStore{
 			filePath: config.Path,
 			s3Client: s3.NewFromConfig(cfg),
 		}
 	}
-	return &lr
+	return &rs
 }
 
 func (r *S3RegistryStore) GetRegistryProto() (*core.Registry, error) {