diff --git a/.github/workflows/XmsCore-CI.yaml b/.github/workflows/XmsCore-CI.yaml
index b12e72444..c074922fa 100644
--- a/.github/workflows/XmsCore-CI.yaml
+++ b/.github/workflows/XmsCore-CI.yaml
@@ -94,7 +94,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install conan devpi-client wheel
-          python -m pip install xmsconan>=2.3.2 -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
+          python -m pip install xmsconan>=2.3.3 -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
       # Setup Conan
       - name: Setup Conan
         run: |
@@ -128,7 +128,7 @@ jobs:
         with:
           CONAN_CHANNEL: stable
           AQUAPI_URL: ${{ secrets.AQUAPI_URL_DEV}}
-        if: startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, ${{ env.XMS_VERSION }})
+        if: ${{ startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, env.XMS_VERSION) }}
       # Generate XMS Conan
       - name: Generate XMS Conan
         run: xmsconan_gen --version ${{ env.XMS_VERSION }} build.toml
@@ -151,6 +151,14 @@ jobs:
           name: wheel-${{ runner.os }}
           path: wheelhouse/*.whl
         if: matrix.build_type == 'Release'
+      # Upload wheel to Aquapi
+      - name: Upload wheel to Aquapi
+        run: |
+          devpi use ${{ env.AQUAPI_URL }}
+          devpi login ${{ env.AQUAPI_USERNAME }} --password ${{ env.AQUAPI_PASSWORD }}
+          devpi upload --from-dir wheelhouse
+        shell: bash
+        if: startsWith(github.ref, 'refs/tags/') && matrix.build_type == 'Release'
       # Upload Release to Conan
       - name: Upload Releases to Conan
         run: "python build.py --skip-build --upload --filter=\"{\\\"build_type\\\": \\\"${{ matrix.build_type }}\\\"}\""
@@ -225,7 +233,7 @@ jobs:
       - name: Install Python Dependencies
         run: |
           pip install conan devpi-client wheel
-          pip install xmsconan>=2.3.2 -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
+          pip install xmsconan>=2.3.3 -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
       # Setup Conan
       - name: Setup Conan
         run: |
@@ -258,7 +266,7 @@ jobs:
         with:
           CONAN_CHANNEL: stable
           AQUAPI_URL: ${{ secrets.AQUAPI_URL_DEV }}
-        if: startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, ${{ env.XMS_VERSION }})
+        if: ${{ startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, env.XMS_VERSION) }}
       # Generate XMS Conan
       - name: Generate XMS Conan
         run: xmsconan_gen --version ${{ env.XMS_VERSION }} build.toml
@@ -281,6 +289,14 @@ jobs:
           name: wheel-${{ runner.os }}
           path: wheelhouse/*.whl
         if: matrix.build_type == 'Release'
+      # Upload wheel to Aquapi
+      - name: Upload wheel to Aquapi
+        run: |
+          devpi use ${{ env.AQUAPI_URL }}
+          devpi login ${{ env.AQUAPI_USERNAME }} --password ${{ env.AQUAPI_PASSWORD }}
+          devpi upload --from-dir wheelhouse
+        shell: bash
+        if: startsWith(github.ref, 'refs/tags/') && matrix.build_type == 'Release'
       # Upload Release to Conan
       - name: Upload Releases to Conan
         run: "python build.py --skip-build --upload --filter=\"{\\\"build_type\\\": \\\"${{ matrix.build_type }}\\\"}\""
@@ -366,7 +382,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install conan devpi-client wheel
-          python -m pip install xmsconan>=2.3.2 -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
+          python -m pip install xmsconan>=2.3.3 -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
       # Setup Visual Studio
       - name: Setup Visual Studio
         uses: microsoft/setup-msbuild@v2
@@ -402,7 +418,7 @@ jobs:
         with:
           CONAN_CHANNEL: stable
           AQUAPI_URL: ${{ secrets.AQUAPI_URL_DEV }}
-        if: startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, ${{ env.XMS_VERSION }})
+        if: ${{ startsWith(github.ref, 'refs/tags/') && startsWith(env.BRANCH_NAME, env.XMS_VERSION) }}
       # Generate XMS Conan
       - name: Generate XMS Conan
         run: xmsconan_gen --version ${{ env.XMS_VERSION }} build.toml
@@ -425,6 +441,14 @@ jobs:
           name: wheel-${{ runner.os }}
           path: wheelhouse/*.whl
         if: matrix.build_type == 'Release'
+      # Upload wheel to Aquapi
+      - name: Upload wheel to Aquapi
+        run: |
+          devpi use ${{ env.AQUAPI_URL }}
+          devpi login ${{ env.AQUAPI_USERNAME }} --password ${{ env.AQUAPI_PASSWORD }}
+          devpi upload --from-dir wheelhouse
+        shell: bash
+        if: startsWith(github.ref, 'refs/tags/') && matrix.build_type == 'Release'
       # Upload Release to Conan
       - name: Upload Releases to Conan
         run: "python build.py --skip-build --upload --filter=\"{\\\"build_type\\\": \\\"${{ matrix.build_type }}\\\"}\""
diff --git a/.gitignore b/.gitignore
index 1898ad4fc..f1efecb8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 build.py
 CMakeLists.txt
 conanfile.py
+xms_conan2_file.py
 _package/pyproject.toml
 
 # Misc