diff --git a/airbyte-webapp/src/core/domain/connector/DestinationDefinitionService.ts b/airbyte-webapp/src/core/domain/connector/DestinationDefinitionService.ts
index 1f8e960f27366..ee192adeda663 100644
--- a/airbyte-webapp/src/core/domain/connector/DestinationDefinitionService.ts
+++ b/airbyte-webapp/src/core/domain/connector/DestinationDefinitionService.ts
@@ -1,8 +1,8 @@
 import { AirbyteRequestService } from "core/request/AirbyteRequestService";
 
 import {
-  createDestinationDefinition,
-  DestinationDefinitionCreate,
+  createCustomDestinationDefinition,
+  CustomDestinationDefinitionCreate,
   DestinationDefinitionIdWithWorkspaceId,
   DestinationDefinitionUpdate,
   getDestinationDefinitionForWorkspace,
@@ -28,7 +28,7 @@ export class DestinationDefinitionService extends AirbyteRequestService {
     return updateDestinationDefinition(body, this.requestOptions);
   }
 
-  public create(body: DestinationDefinitionCreate) {
-    return createDestinationDefinition(body, this.requestOptions);
+  public createCustom(body: CustomDestinationDefinitionCreate) {
+    return createCustomDestinationDefinition(body, this.requestOptions);
   }
 }
diff --git a/airbyte-webapp/src/core/domain/connector/SourceDefinitionService.ts b/airbyte-webapp/src/core/domain/connector/SourceDefinitionService.ts
index 701450ff6d107..1578f63106af7 100644
--- a/airbyte-webapp/src/core/domain/connector/SourceDefinitionService.ts
+++ b/airbyte-webapp/src/core/domain/connector/SourceDefinitionService.ts
@@ -7,8 +7,8 @@ import {
   SourceDefinitionIdWithWorkspaceId,
   updateSourceDefinition,
   SourceDefinitionUpdate,
-  createSourceDefinition,
-  SourceDefinitionCreate,
+  CustomSourceDefinitionCreate,
+  createCustomSourceDefinition,
 } from "../../request/AirbyteClient";
 
 export class SourceDefinitionService extends AirbyteRequestService {
@@ -28,7 +28,7 @@ export class SourceDefinitionService extends AirbyteRequestService {
     return updateSourceDefinition(body, this.requestOptions);
   }
 
-  public create(body: SourceDefinitionCreate) {
-    return createSourceDefinition(body, this.requestOptions);
+  public createCustom(body: CustomSourceDefinitionCreate) {
+    return createCustomSourceDefinition(body, this.requestOptions);
   }
 }
diff --git a/airbyte-webapp/src/pages/SettingsPage/pages/ConnectorsPage/components/CreateConnector.tsx b/airbyte-webapp/src/pages/SettingsPage/pages/ConnectorsPage/components/CreateConnector.tsx
index 654e33790bc2b..265bc4d08aa83 100644
--- a/airbyte-webapp/src/pages/SettingsPage/pages/ConnectorsPage/components/CreateConnector.tsx
+++ b/airbyte-webapp/src/pages/SettingsPage/pages/ConnectorsPage/components/CreateConnector.tsx
@@ -9,6 +9,7 @@ import { Button } from "components/ui/Button";
 import { RoutePaths, DestinationPaths } from "pages/routePaths";
 import { useCreateDestinationDefinition } from "services/connector/DestinationDefinitionService";
 import { useCreateSourceDefinition } from "services/connector/SourceDefinitionService";
+import { useCurrentWorkspaceId } from "services/workspaces/WorkspacesService";
 
 import CreateConnectorModal from "./CreateConnectorModal";
 
@@ -25,6 +26,7 @@ interface ICreateProps {
 
 const CreateConnector: React.FC<IProps> = ({ type }) => {
   const navigate = useNavigate();
+  const workspaceId = useCurrentWorkspaceId();
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [errorMessage, setErrorMessage] = useState("");
   const onChangeModalState = () => {
@@ -45,7 +47,7 @@ const CreateConnector: React.FC<IProps> = ({ type }) => {
 
       navigate(
         {
-          pathname: `${RoutePaths.Source}${RoutePaths.SourceNew}`,
+          pathname: `/${RoutePaths.Workspaces}/${workspaceId}/${RoutePaths.Source}/${RoutePaths.SourceNew}`,
         },
         { state: { sourceDefinitionId: result.sourceDefinitionId } }
       );
@@ -61,7 +63,7 @@ const CreateConnector: React.FC<IProps> = ({ type }) => {
 
       navigate(
         {
-          pathname: `${RoutePaths.Destination}${DestinationPaths.NewDestination}`,
+          pathname: `/${RoutePaths.Workspaces}/${workspaceId}/${RoutePaths.Destination}/${DestinationPaths.NewDestination}`,
         },
         { state: { destinationDefinitionId: result.destinationDefinitionId } }
       );
diff --git a/airbyte-webapp/src/services/connector/DestinationDefinitionService.ts b/airbyte-webapp/src/services/connector/DestinationDefinitionService.ts
index 72b957dcbc651..bd6ef45337491 100644
--- a/airbyte-webapp/src/services/connector/DestinationDefinitionService.ts
+++ b/airbyte-webapp/src/services/connector/DestinationDefinitionService.ts
@@ -76,9 +76,10 @@ const useDestinationDefinition = <T extends string | undefined>(
 const useCreateDestinationDefinition = () => {
   const service = useGetDestinationDefinitionService();
   const queryClient = useQueryClient();
+  const workspaceId = useCurrentWorkspaceId();
 
   return useMutation<DestinationDefinitionRead, Error, DestinationDefinitionCreate>(
-    (destinationDefinition) => service.create(destinationDefinition),
+    (destinationDefinition) => service.createCustom({ workspaceId, destinationDefinition }),
     {
       onSuccess: (data) => {
         queryClient.setQueryData(
diff --git a/airbyte-webapp/src/services/connector/SourceDefinitionService.ts b/airbyte-webapp/src/services/connector/SourceDefinitionService.ts
index 6359ee3c431b5..1eb287de555fe 100644
--- a/airbyte-webapp/src/services/connector/SourceDefinitionService.ts
+++ b/airbyte-webapp/src/services/connector/SourceDefinitionService.ts
@@ -74,9 +74,10 @@ const useSourceDefinition = <T extends string | undefined>(
 const useCreateSourceDefinition = () => {
   const service = useGetSourceDefinitionService();
   const queryClient = useQueryClient();
+  const workspaceId = useCurrentWorkspaceId();
 
   return useMutation<SourceDefinitionRead, Error, SourceDefinitionCreate>(
-    (sourceDefinition) => service.create(sourceDefinition),
+    (sourceDefinition) => service.createCustom({ workspaceId, sourceDefinition }),
     {
       onSuccess: (data) => {
         queryClient.setQueryData(