diff --git a/.github/workflows/pioneer-pr.yml b/.github/workflows/pioneer-pr.yml
index 1889ae663d..cd23d3d52f 100644
--- a/.github/workflows/pioneer-pr.yml
+++ b/.github/workflows/pioneer-pr.yml
@@ -1,9 +1,9 @@
-name: Pioneer-PR
+name: Pioneer
 on: [pull_request, push]
 
 jobs:
-  pioneer_build_code:
-    name: Pioneer Build Code
+  pioneer_build_ubuntu:
+    name: Ubuntu Build
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -17,11 +17,11 @@ jobs:
     - name: build
       run: |
         yarn install --frozen-lockfile
-        yarn workspace pioneer run build:code
+        yarn workspace pioneer run build
 
-  pioneer_build_i18n:
-    name: Pioneer Build i18n
-    runs-on: ubuntu-latest
+  pioneer_build_osx:
+    name: MacOS Build
+    runs-on: macos-latest
     strategy:
       matrix:
         node-version: [12.x]
@@ -34,4 +34,4 @@ jobs:
     - name: build
       run: |
         yarn install --frozen-lockfile
-        yarn workspace pioneer run build:i18n
+        yarn workspace pioneer run build
diff --git a/pioneer/packages/joy-utils/src/react/context/transport.tsx b/pioneer/packages/joy-utils/src/react/context/transport.tsx
index 4d8e6c8771..9c01a61a7e 100644
--- a/pioneer/packages/joy-utils/src/react/context/transport.tsx
+++ b/pioneer/packages/joy-utils/src/react/context/transport.tsx
@@ -2,7 +2,7 @@ import React, { createContext, useContext } from "react";
 import { ApiContext } from "@polkadot/react-api";
 import { ApiProps } from "@polkadot/react-api/types";
 
-import Transport from "../../transport";
+import Transport from "../../transport/index";
 
 export const TransportContext = createContext<Transport>((null as unknown) as Transport);
 
diff --git a/pioneer/packages/joy-utils/src/react/hooks/useTransport.tsx b/pioneer/packages/joy-utils/src/react/hooks/useTransport.tsx
index d8079b4d0f..3e697eec30 100644
--- a/pioneer/packages/joy-utils/src/react/hooks/useTransport.tsx
+++ b/pioneer/packages/joy-utils/src/react/hooks/useTransport.tsx
@@ -1,5 +1,5 @@
 import { useContext } from 'react';
-import Transport from "../../transport";
+import Transport from "../../transport/index";
 import { TransportContext } from "../context";
 
 export default function useTransport() {