diff --git a/.github/renovate.json b/.github/renovate.json
index 2f0f049b..2d6a1a17 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -50,6 +50,31 @@
     }
   ],
   "customManagers": [
+    {
+      "customType": "regex",
+      "fileMatch": [
+        "^\\.github/workflows/ci\\.yaml$"
+      ],
+      "datasourceTemplate": "github-commits",
+      "packageNameTemplate": "windsorcli/cli",
+      "versioningTemplate": "semver",
+      "matchStrings": [
+        "ref:\\s*(?<currentValue>main)"
+      ]
+    },
+    {
+      "customType": "regex",
+      "fileMatch": [
+        "^\\.github/workflows/ci\\.yaml$"
+      ],
+      "matchStrings": [
+        "(^|\\s)WINDSORCLI_VERSION:\\s*(?<currentValue>v[\\d\\.]+)"
+      ],
+      "depNameTemplate": "version",
+      "datasourceTemplate": "github-tags",
+      "packageNameTemplate": "windsorcli/cli",
+      "versioningTemplate": "semver"
+    },
     {
       "customType": "regex",
       "fileMatch": ["^\\.github/workflows/ci\\.yaml$"],
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 952c2543..e0b557a6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,6 +8,9 @@ on:
     branches:
       - main
 
+env:
+  WINDSOR_PROJECT_ROOT: ${{ github.workspace }}
+
 jobs:
   # Blueprint Checks
   checks:
@@ -24,7 +27,7 @@ jobs:
       TALOSCONFIG: ${{ github.workspace }}/contexts/local/.talos/config
       PRIVATE_DOMAIN_NAME: private.test
       DNS_SERVER_IP: "10.5.255.200"
-      WINDSOR_VERSION: "v0.2.0"
+      WINDSORCLI_VERSION: "v0.5.1"
 
     steps:
       - name: Checkout code
@@ -40,25 +43,37 @@ jobs:
           key: docker-cache-${{ runner.os }}-${{ github.sha }}
           restore-keys: docker-cache-${{ runner.os }}-
 
-      - name: Install Aqua
+      # Install Aqua
+      - name: Install Aqua on Linux/macOS
         uses: aquaproj/aqua-installer@e2d0136abcf70b7a2f6f505720640750557c4b33 # v3.1.1
         with:
           aqua_version: v2.44.1
+          
+      - name: Set aqua path on Linux/macOS
+        run: |
+          echo "${AQUA_ROOT_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/aquaproj-aqua}/bin" >> $GITHUB_PATH
 
+      # Install tools
       - name: Install tools
-        run: aqua install
-      
-      - name: Install Windsor CLI from Main Branch
         run: |
-          git clone https://github.com/windsorcli/cli.git
-          cd cli/cmd/windsor
-          go build -o windsor
-          chmod +x windsor
-          mkdir -p $HOME/.local/bin
-          mv windsor $HOME/.local/bin
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
+          aqua install     
+
+      # Install Windsor CLI
+      - name: Install Windsor CLI
+        uses: windsorcli/action/.github/actions/windsorcli@078842a08b468bd2278563bbc929e9d968095988 # v0.2.0
+        with:
+          version: ${{ env.WINDSORCLI_VERSION }}
+          install_folder: ${{ github.workspace }}/bin
+          context: local
+
+      # Windsor Up
+      - name: Windsor Up on Linux/macOS
+        run: |
+          windsor init local
+
+          windsor up --install --verbose
 
-      - name: Print Windsor Version
+      # Windsor Down
+      - name: Windsor Down on Linux/macOS
         run: |
-          windsor version
-          
\ No newline at end of file
+          windsor down --clean
diff --git a/README.md b/README.md
index 577df64d..b9680fd1 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
 # core
 Core configurations used as the basis for most blueprints
+
+![CI Workflow](https://github.com/your-repo/core/actions/workflows/ci.yaml/badge.svg)