diff --git a/server/src/Http/Controllers/Internal/v1/RegistryExtensionBundleController.php b/server/src/Http/Controllers/Internal/v1/RegistryExtensionBundleController.php
index 75c43d3..6413df3 100644
--- a/server/src/Http/Controllers/Internal/v1/RegistryExtensionBundleController.php
+++ b/server/src/Http/Controllers/Internal/v1/RegistryExtensionBundleController.php
@@ -8,7 +8,7 @@
 use Fleetbase\RegistryBridge\Http\Requests\CreateRegistryExtensionBundleRequest;
 use Fleetbase\RegistryBridge\Http\Requests\RegistryExtensionActionRequest;
 use Fleetbase\RegistryBridge\Models\RegistryExtensionBundle;
-use Fleetbase\Support\Utils;
+use Fleetbase\RegistryBridge\Support\Utils;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
diff --git a/server/src/Http/Filter/RegistryExtensionFilter.php b/server/src/Http/Filter/RegistryExtensionFilter.php
index 30adca3..7b4f0d3 100644
--- a/server/src/Http/Filter/RegistryExtensionFilter.php
+++ b/server/src/Http/Filter/RegistryExtensionFilter.php
@@ -3,7 +3,7 @@
 namespace Fleetbase\RegistryBridge\Http\Filter;
 
 use Fleetbase\Http\Filter\Filter;
-use Fleetbase\Support\Utils;
+use Fleetbase\RegistryBridge\Support\Utils;
 use Illuminate\Support\Str;
 
 class RegistryExtensionFilter extends Filter
diff --git a/server/src/Models/RegistryExtension.php b/server/src/Models/RegistryExtension.php
index c8e1721..f8f7d09 100644
--- a/server/src/Models/RegistryExtension.php
+++ b/server/src/Models/RegistryExtension.php
@@ -10,7 +10,6 @@
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
 use Fleetbase\RegistryBridge\Support\Utils;
-use Fleetbase\Support\Utils as SupportUtils;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicId;
@@ -627,7 +626,7 @@ public function createStripeCheckoutSession(string $returnUri): \Stripe\Checkout
 
         // Calculate the fee fleetbase takes for faciliation of extension
         $totalAmount    = $price->unit_amount;
-        $facilitatorFee = SupportUtils::calculatePercentage(config('registry-bridge.facilitator_fee', 10), $totalAmount);
+        $facilitatorFee = Utils::calculatePercentage(config('registry-bridge.facilitator_fee', 10), $totalAmount);
 
         // Get the stripe client to create the checkout session
         $stripe          = Utils::getStripeClient();
@@ -642,7 +641,7 @@ public function createStripeCheckoutSession(string $returnUri): \Stripe\Checkout
                 ],
             ],
             'mode'                => 'payment',
-            'return_url'          => SupportUtils::consoleUrl($returnUri) . '?extension_id=' . $this->uuid . '&checkout_session_id={CHECKOUT_SESSION_ID}',
+            'return_url'          => Utils::consoleUrl($returnUri) . '?extension_id=' . $this->uuid . '&checkout_session_id={CHECKOUT_SESSION_ID}',
             'payment_intent_data' => [
                 'application_fee_amount' => $facilitatorFee,
                 'transfer_data'          => [
diff --git a/server/src/Models/RegistryExtensionBundle.php b/server/src/Models/RegistryExtensionBundle.php
index eba8287..8a4dcd9 100644
--- a/server/src/Models/RegistryExtensionBundle.php
+++ b/server/src/Models/RegistryExtensionBundle.php
@@ -8,8 +8,8 @@
 use Fleetbase\Models\Model;
 use Fleetbase\Models\User;
 use Fleetbase\RegistryBridge\Exceptions\InstallFailedException;
+use Fleetbase\RegistryBridge\Support\Utils;
 use Fleetbase\Support\SocketCluster\SocketClusterService;
-use Fleetbase\Support\Utils;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicId;
diff --git a/server/src/Providers/RegistryBridgeServiceProvider.php b/server/src/Providers/RegistryBridgeServiceProvider.php
index a2f6298..00324f6 100644
--- a/server/src/Providers/RegistryBridgeServiceProvider.php
+++ b/server/src/Providers/RegistryBridgeServiceProvider.php
@@ -88,7 +88,7 @@ public function mergeConfigFromSettings()
             return;
         }
 
-        $registryHost = Setting::getByKey('registry-bridge.registry.host');
+        $registryHost  = Setting::getByKey('registry-bridge.registry.host');
         $registryToken = Setting::getByKey('registry-bridge.registry.token');
 
         if ($registryHost) {