diff --git a/config/dev-local.js b/config/dev-local.js
index ccefb3c6d4..1badc7dace 100644
--- a/config/dev-local.js
+++ b/config/dev-local.js
@@ -8,9 +8,7 @@ module.exports = merge(base, devVm, {
 		host: 'localhost',
 		publicPath: '/',
 		photoPath: 'https://www-dev-kiva-org.freetls.fastly.net/img/',
-		graphqlUri: 'https://marketplace-api.dk1.kiva.org/graphql',
-		// Alternate graphql url (marketplace-api.dk1.kiva.org is redirected to this url)
-		// graphqlUri: 'https://gateway.development.kiva.org/graphql',
+		graphqlUri: 'https://gateway.development.kiva.org/graphql',
 		enableAnalytics: false,
 		enableSnowplow: false,
 		snowplowUri: 'events.fivetran.com/snowplow/v5qt54ocr2nm',
@@ -28,10 +26,8 @@ module.exports = merge(base, devVm, {
 		},
 	},
 	server: {
-		graphqlUri: 'https://marketplace-api.dk1.kiva.org/graphql',
-		sessionUri: 'https://www.dev.kiva.org/start-ui-session',
-		// Alternate session url
-		// sessionUri: 'https://www.development.kiva.org/start-ui-session',
+		graphqlUri: 'https://gateway.development.kiva.org/graphql',
+		sessionUri: 'https://www.development.kiva.org/start-ui-session',
 		memcachedEnabled: false,
 		disableCluster: true,
 	}
diff --git a/src/components/RandomLoanSelector/RandomLoanSelector.vue b/src/components/Checkout/EmptyBasketCarousel.vue
similarity index 86%
rename from src/components/RandomLoanSelector/RandomLoanSelector.vue
rename to src/components/Checkout/EmptyBasketCarousel.vue
index fbd5074918..e737be59f9 100644
--- a/src/components/RandomLoanSelector/RandomLoanSelector.vue
+++ b/src/components/Checkout/EmptyBasketCarousel.vue
@@ -45,20 +45,17 @@
 <script>
 import _throttle from 'lodash/throttle';
 import KvClassicLoanCardContainer from '@/components/LoanCards/KvClassicLoanCardContainer';
-import emptyBasketData from '@/graphql/query/checkout/emptyBasketData.graphql';
+import { runLoansQuery } from '@/util/loanSearch/dataUtils';
+import { FLSS_ORIGIN_CHECKOUT } from '@/util/flssUtils';
 import KvCarousel from '~/@kiva/kv-components/vue/KvCarousel';
 
 export default {
-	name: 'RandomLoanSelector',
+	name: 'EmptyBasketCarousel',
 	components: {
 		KvCarousel,
 		KvClassicLoanCardContainer
 	},
 	props: {
-		loans: {
-			type: Array,
-			default: () => [],
-		},
 		enableFiveDollarsNotes: {
 			type: Boolean,
 			default: false
@@ -66,10 +63,8 @@ export default {
 	},
 	data() {
 		return {
-			carouselCardWidth: '240px',
 			randomLoans: [],
 			loading: false,
-			scrollPos: 0,
 			windowWidth: typeof window !== 'undefined' ? window.innerWidth : 1024,
 			handleResize: _throttle(this.isWindowWidth, 200)
 		};
@@ -93,14 +88,15 @@ export default {
 		},
 	},
 	methods: {
-		loadLoans() {
+		async loadLoans() {
 			this.$emit('updating-totals', true);
-			this.apollo.query({
-				query: emptyBasketData,
-			}).then(({ data }) => {
-				this.randomLoans = data?.lend?.randomLoans?.values ?? [];
-				this.$emit('updating-totals', false);
-			});
+			const { loans } = await runLoansQuery(
+				this.apollo,
+				{ pageLimit: 15 },
+				FLSS_ORIGIN_CHECKOUT
+			);
+			this.randomLoans = loans ?? [];
+			this.$emit('updating-totals', false);
 		},
 		onInteractCarousel(interaction) {
 			this.$kvTrackEvent('carousel', 'click-carousel-horizontal-scroll', interaction);
diff --git a/src/graphql/query/checkout/emptyBasketData.graphql b/src/graphql/query/checkout/emptyBasketData.graphql
deleted file mode 100644
index dad86e5ab5..0000000000
--- a/src/graphql/query/checkout/emptyBasketData.graphql
+++ /dev/null
@@ -1,38 +0,0 @@
-query emptyBasketData(
-	$imgDefaultSize: String = "w480h360",
-	$imgRetinaSize: String = "w480h360",
-) {
-	lend {
-		randomLoans: loans (filters: {status: fundraising}, limit: 15, sortBy: random) {
-			values {
-				id
-				name
-				loanAmount
-				minNoteSize
-				loanFundraisingInfo {
-					fundedAmount
-					reservedAmount
-				}
-				image {
-					id
-					default: url(customSize: $imgDefaultSize)
-					retina: url(customSize: $imgRetinaSize)
-				}
-				activity {
-					id
-					name
-				}
-				geocode {
-					country {
-						isoCode
-						name
-					}
-				}
-				sector {
-          			id
-          			name
-        		}
-			}
-		}
-	}
-}
diff --git a/src/pages/Checkout/CheckoutPage.vue b/src/pages/Checkout/CheckoutPage.vue
index d325b4a3da..87ecce4949 100644
--- a/src/pages/Checkout/CheckoutPage.vue
+++ b/src/pages/Checkout/CheckoutPage.vue
@@ -247,7 +247,7 @@
 					data-testid="empty-basket-loans"
 					style="min-height: 23rem;"
 				>
-					<random-loan-selector
+					<empty-basket-carousel
 						:enable-five-dollars-notes="enableFiveDollarsNotes"
 						@updating-totals="setUpdatingTotals"
 						@refreshtotals="refreshTotals"
@@ -298,7 +298,7 @@ import CampaignVerificationForm from '@/components/CorporateCampaign/CampaignVer
 import CampaignJoinTeamForm from '@/components/CorporateCampaign/CampaignJoinTeamForm';
 import CheckoutHolidayPromo from '@/components/Checkout/CheckoutHolidayPromo';
 import CheckoutDropInPaymentWrapper from '@/components/Checkout/CheckoutDropInPaymentWrapper';
-import RandomLoanSelector from '@/components/RandomLoanSelector/RandomLoanSelector';
+import EmptyBasketCarousel from '@/components/Checkout/EmptyBasketCarousel';
 import VerifyRemovePromoCredit from '@/components/Checkout/VerifyRemovePromoCredit';
 import upsellQuery from '@/graphql/query/checkout/upsellLoans.graphql';
 import UpsellModule from '@/components/Checkout/UpsellModule';
@@ -349,7 +349,7 @@ export default {
 		CampaignVerificationForm,
 		CheckoutHolidayPromo,
 		CheckoutDropInPaymentWrapper,
-		RandomLoanSelector,
+		EmptyBasketCarousel,
 		VerifyRemovePromoCredit,
 		UpsellModule,
 		MatchedLoansLightbox,
diff --git a/src/util/flssUtils.js b/src/util/flssUtils.js
index 40e0e18617..b639b90cb9 100644
--- a/src/util/flssUtils.js
+++ b/src/util/flssUtils.js
@@ -16,6 +16,7 @@ export const FLSS_ORIGIN_LEND_FILTER = 'web:lend-filter';
 export const FLSS_ORIGIN_BP_FUNDED = 'web:bp-funded';
 export const FLSS_ORIGIN_THANKS = 'web:thanks';
 export const FLSS_ORIGIN_PORTFOLIO_OVERVIEW = 'web:portfolio-overview';
+export const FLSS_ORIGIN_CHECKOUT = 'web:empty-checkout';
 
 /**
  * Gets the filters for FLSS