diff --git a/modules/ppcp-api-client/services.php b/modules/ppcp-api-client/services.php
index bee10d72f..a0d04ae3f 100644
--- a/modules/ppcp-api-client/services.php
+++ b/modules/ppcp-api-client/services.php
@@ -80,6 +80,8 @@ use WooCommerce\PayPalCommerce\ApiClient\Repository\PayeeRepository;
 use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
 use WooCommerce\PayPalCommerce\ApiClient\Authentication\ConnectBearer;
 use WooCommerce\PayPalCommerce\WcGateway\Helper\EnvironmentConfig;
+use WooCommerce\PayPalCommerce\Onboarding\State;
+use WooCommerce\PayPalCommerce\WcGateway\Helper\Environment;
 
 return array(
 	'api.host'                                       => function( ContainerInterface $container ) : string {
@@ -933,4 +935,33 @@ return array(
 			$container->get( 'api.endpoint.partner-referrals-sandbox' )
 		);
 	},
+	'api.sandbox-host'                               => static function ( ContainerInterface $container ): string {
+
+		$state       = $container->get( 'onboarding.state' );
+
+		/**
+		 * The State object.
+		 *
+		 * @var State $state
+		 */
+		if ( $state->current_state() >= State::STATE_ONBOARDED ) {
+			return PAYPAL_SANDBOX_API_URL;
+		}
+		return CONNECT_WOO_SANDBOX_URL;
+	},
+	'api.production-host'                            => static function ( ContainerInterface $container ): string {
+
+		$state       = $container->get( 'onboarding.state' );
+
+		/**
+		 * The Environment and State variables.
+		 *
+		 * @var Environment $environment
+		 * @var State $state
+		 */
+		if ( $state->current_state() >= State::STATE_ONBOARDED ) {
+			return PAYPAL_API_URL;
+		}
+		return CONNECT_WOO_URL;
+	},
 );
diff --git a/modules/ppcp-onboarding/services.php b/modules/ppcp-onboarding/services.php
index 7756b69db..17c9ba8c0 100644
--- a/modules/ppcp-onboarding/services.php
+++ b/modules/ppcp-onboarding/services.php
@@ -20,35 +20,6 @@ use WooCommerce\PayPalCommerce\Onboarding\Render\OnboardingRenderer;
 use WooCommerce\PayPalCommerce\WcGateway\Helper\Environment;
 
 return array(
-	'api.sandbox-host'                   => static function ( ContainerInterface $container ): string {
-
-		$state       = $container->get( 'onboarding.state' );
-
-		/**
-		 * The State object.
-		 *
-		 * @var State $state
-		 */
-		if ( $state->current_state() >= State::STATE_ONBOARDED ) {
-			return PAYPAL_SANDBOX_API_URL;
-		}
-		return CONNECT_WOO_SANDBOX_URL;
-	},
-	'api.production-host'                => static function ( ContainerInterface $container ): string {
-
-		$state       = $container->get( 'onboarding.state' );
-
-		/**
-		 * The Environment and State variables.
-		 *
-		 * @var Environment $environment
-		 * @var State $state
-		 */
-		if ( $state->current_state() >= State::STATE_ONBOARDED ) {
-			return PAYPAL_API_URL;
-		}
-		return CONNECT_WOO_URL;
-	},
 	'api.host'                           => static function ( ContainerInterface $container ): string {
 		$environment = $container->get( 'onboarding.environment' );