diff --git a/.github/workflows/node-cosmos-docker.yml b/.github/workflows/node-cosmos-docker.yml
index 2953953bf..c76a61da9 100644
--- a/.github/workflows/node-cosmos-docker.yml
+++ b/.github/workflows/node-cosmos-docker.yml
@@ -58,3 +58,56 @@ jobs:
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
 
+
+  node-build-push-docker-subquery:
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 100
+          token: ${{ secrets.REPO_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: subquerynetwork
+          password: ${{ secrets.SQ_DOCKERHUB_TOKEN }}
+
+      ## node
+      - name: Get updated node version
+        id: get-node-version
+        run: |
+          sh .github/workflows/scripts/nodeVersion.sh
+
+      - name: Build and push
+        if: github.event.inputs.isLatest == 'false'
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          platforms: arm64,amd64
+          file: ./packages/node/Dockerfile
+          tags: subquerynetwork/subql-node-cosmos:v${{ steps.get-node-version.outputs.NODE_VERSION }},
+          build-args: RELEASE_VERSION=${{ steps.get-node-version.outputs.NODE_VERSION }}
+
+      - name: Build and push
+        if: github.event.inputs.isLatest == 'true'
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          platforms: arm64,amd64
+          file: ./packages/node/Dockerfile
+          tags: subquerynetwork/subql-node-cosmos:v${{ steps.get-node-version.outputs.NODE_VERSION }},subquerynetwork/subql-node-cosmos:latest
+          build-args: RELEASE_VERSION=${{ steps.get-node-version.outputs.NODE_VERSION }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
+
+
+
diff --git a/packages/node/src/main.ts b/packages/node/src/main.ts
index b6a8df0ff..e4fde7b1e 100644
--- a/packages/node/src/main.ts
+++ b/packages/node/src/main.ts
@@ -17,7 +17,8 @@ initLogger(
   argv.logLevel as string | undefined,
 );
 
-if (argv._[0] === undefined) {
+// Check for no subcommand
+if (!argv._[0]) {
   // Lazy import, to allow logger to be initialised before bootstrap()
   // As bootstrap runs services that requires logger
   const { bootstrap } = require('./init');