diff --git a/.github/workflows/ci-nimbus.yml b/.github/workflows/ci-nimbus.yml
index 11fea1b..a83fcde 100644
--- a/.github/workflows/ci-nimbus.yml
+++ b/.github/workflows/ci-nimbus.yml
@@ -1,9 +1,14 @@
 name: CI-nimbus
 on:
+  # push:
+  #   paths:
+  #   - atlas.lock
+  #   - .github/workflows/ci-nimbus.yml
   push:
-    paths:
-    - atlas.lock
-    - .github/workflows/ci-nimbus.yml
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   build:
@@ -14,14 +19,10 @@ jobs:
         target:
           - os: linux
             cpu: amd64
-          # - os: linux
-          #   cpu: i386
-          - os: macos
-            cpu: amd64
-          - os: windows
-            cpu: amd64
-          #- os: windows
-            #cpu: i386
+          # - os: macos
+          #   cpu: amd64
+          # - os: windows
+          #   cpu: amd64
         branch: [version-1-6]
         include:
           - target:
@@ -50,37 +51,6 @@ jobs:
         with:
           submodules: true
 
-      - name: Install build dependencies (Linux i386)
-        if: runner.os == 'Linux' && matrix.target.cpu == 'i386'
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt-get update -qq
-          sudo DEBIAN_FRONTEND='noninteractive' apt-get install \
-            --no-install-recommends -yq gcc-multilib g++-multilib \
-            libssl-dev:i386
-          mkdir -p external/bin
-          cat << EOF > external/bin/gcc
-          #!/bin/bash
-          exec $(which gcc) -m32 "\$@"
-          EOF
-          cat << EOF > external/bin/g++
-          #!/bin/bash
-          exec $(which g++) -m32 "\$@"
-          EOF
-          chmod 755 external/bin/gcc external/bin/g++
-          echo '${{ github.workspace }}/external/bin' >> $GITHUB_PATH
-
-      - name: MSYS2 (Windows i386)
-        if: runner.os == 'Windows' && matrix.target.cpu == 'i386'
-        uses: msys2/setup-msys2@v2
-        with:
-          path-type: inherit
-          msystem: MINGW32
-          install: >-
-            base-devel
-            git
-            mingw-w64-i686-toolchain
-
       - name: MSYS2 (Windows amd64)
         if: runner.os == 'Windows' && matrix.target.cpu == 'amd64'
         uses: msys2/setup-msys2@v2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ebfb9e..208946b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,8 +19,6 @@ jobs:
             cpu: amd64
           - os: windows
             cpu: amd64
-          #- os: windows
-            #cpu: i386
         branch: [version-1-6]
         include:
           - target:
@@ -140,6 +138,23 @@ jobs:
           echo "ncpu=$ncpu" >> $GITHUB_ENV
           echo "MAKE_CMD=${MAKE_CMD}" >> $GITHUB_ENV
 
+      - uses: jiro4989/setup-nim-action@v1
+        with:
+          nim-version: 1.6.14
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup Paths
+        run: |
+          rm -rf ~/.nimble/
+          rm -rf ./.nimble
+          echo "NIMBLE_DIR=${PWD}/.nimble" >> $GITHUB_ENV
+          
+      - name: Setup Nimble
+        uses: "./.github/actions/install_nimble"
+        with:
+          os: ${{ matrix.target.os }}
+          cpu: ${{ matrix.target.cpu }}
+
       - name: Restore nimble dependencies from cache
         id: nimble_deps
         uses: actions/cache@v3
@@ -148,20 +163,9 @@ jobs:
             ${{ github.workspace }} / .nimble
           key: ${{ matrix.target.os }}-${{ matrix.target.cpu }}-dotnimble-${{ hashFiles('nimble.lock') }}
 
-      - name: Setup Nimble
-        uses: "./.github/actions/install_nimble"
-        with:
-          os: ${{ matrix.target.os }}
-          cpu: ${{ matrix.target.cpu }}
-
-      - name: Setup Nim
-        run: |
-          rm -rf ~/.nimble/
-          nimble -v
-          
       - name: Setup Deps
         run: |
-          nimble install
+          nimble install -d
 
       - name: Run tests
         run: |
diff --git a/nimble.lock b/nimble.lock
index 3ef8ef0..32dbcd9 100644
--- a/nimble.lock
+++ b/nimble.lock
@@ -1,16 +1,6 @@
 {
   "version": 2,
   "packages": {
-    "nim": {
-      "version": "1.6.14",
-      "vcsRevision": "71ba2e7f3c5815d956b1ae0341b0743242b8fec6",
-      "url": "https://github.com/nim-lang/Nim.git",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "f9ce6fa986a4e75514fe26d4c773789b8897eb18"
-      }
-    },
     "unittest2": {
       "version": "0.0.2",
       "vcsRevision": "02c49b8a994dd3f9eddfaab45262f9b8fa507f8e",