diff --git a/internal/client/apis/apis.go b/internal/client/apis/apis.go
index a6558bdfb..291b6517f 100644
--- a/internal/client/apis/apis.go
+++ b/internal/client/apis/apis.go
@@ -412,53 +412,9 @@ func exportAPIProxies(wg *sync.WaitGroup, jobs <-chan revision, folder string, e
 		if !ok {
 			return
 		}
-		u, _ := url.Parse(apiclient.BaseURL)
-		q := u.Query()
-		q.Set("format", "bundle")
-		u.RawQuery = q.Encode()
-		u.Path = path.Join(u.Path, apiclient.GetApigeeOrg(), "apis", job.name, "revisions", job.rev)
-
-		fname := job.name + "_" + job.rev
-		fd, err := os.CreateTemp("", fname)
-		if err != nil {
-			errs <- err
-			continue
-		}
-
-		err = apiclient.GetHttpClient()
-		if err != nil {
-			errs <- err
-			continue
-		}
-		req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+		err := apiclient.FetchBundle("apis", folder, job.name, job.rev, false)
 		if err != nil {
 			errs <- err
-			continue
-		}
-		req, err = apiclient.SetAuthHeader(req)
-		if err != nil {
-			errs <- err
-			continue
-		}
-
-		resp, err := apiclient.ApigeeAPIClient.Do(req)
-		if err != nil {
-			errs <- err
-			continue
-		}
-		if _, err = io.Copy(fd, resp.Body); err != nil {
-			errs <- err
-			continue
-		}
-		_ = fd.Close()
-
-		fpath := filepath.Join(folder, fname+".zip")
-		if err = os.Rename(filepath.Join(fd.Name()), fpath); err != nil {
-			errs <- err
-			continue
-		}
-		if err = os.Chmod(fpath, 0o644); err != nil {
-			errs <- err
 		}
 	}
 }
diff --git a/internal/client/sharedflows/sharedflows.go b/internal/client/sharedflows/sharedflows.go
index 6df687caf..bab4fa417 100644
--- a/internal/client/sharedflows/sharedflows.go
+++ b/internal/client/sharedflows/sharedflows.go
@@ -365,53 +365,9 @@ func exportSharedFlows(wg *sync.WaitGroup, jobs <-chan revision, folder string,
 		if !ok {
 			return
 		}
-		u, _ := url.Parse(apiclient.BaseURL)
-		q := u.Query()
-		q.Set("format", "bundle")
-		u.RawQuery = q.Encode()
-		u.Path = path.Join(u.Path, apiclient.GetApigeeOrg(), "sharedflows", job.name, "revisions", job.rev)
-
-		fname := job.name + "_" + job.rev
-		fd, err := os.CreateTemp("", fname)
-		if err != nil {
-			errs <- err
-			continue
-		}
-
-		err = apiclient.GetHttpClient()
-		if err != nil {
-			errs <- err
-			continue
-		}
-		req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+		err := apiclient.FetchBundle("sharedflows", folder, job.name, job.rev, false)
 		if err != nil {
 			errs <- err
-			continue
-		}
-		req, err = apiclient.SetAuthHeader(req)
-		if err != nil {
-			errs <- err
-			continue
-		}
-
-		resp, err := apiclient.ApigeeAPIClient.Do(req)
-		if err != nil {
-			errs <- err
-			continue
-		}
-		if _, err = io.Copy(fd, resp.Body); err != nil {
-			errs <- err
-			continue
-		}
-		_ = fd.Close()
-
-		fpath := filepath.Join(folder, fname+".zip")
-		if err = os.Rename(filepath.Join(fd.Name()), fpath); err != nil {
-			errs <- err
-			continue
-		}
-		if err = os.Chmod(fpath, 0o644); err != nil {
-			errs <- err
 		}
 	}
 }