diff --git a/.conda/bld.bat b/.conda/bld.bat
deleted file mode 100644
index 833097afe4..0000000000
--- a/.conda/bld.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-:: Install scripts in bin folder
-%PYTHON% setup.py install
-
-:: Copy database files to shared directory
-cd %PREFIX%
-mkdir share\rmgdatabase
-xcopy "%SRC_DIR%\input" %PREFIX%\share\rmgdatabase /E
-
-:: Create rmgrc file that points to this folder in site-packages/rmgpy directory
-cd "%SP_DIR%"
-mkdir rmgpy
-(echo database.directory : %PREFIX%\share\rmgdatabase) > %SP_DIR%\rmgpy\rmgrc
diff --git a/.conda/meta.yaml b/.conda/meta.yaml
index 1c9156fa5c..03189a6ad2 100644
--- a/.conda/meta.yaml
+++ b/.conda/meta.yaml
@@ -7,6 +7,7 @@ source:
   path: ../
 
 build:
+  noarch: generic
   number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
 
 requirements:
diff --git a/.github/workflows/conda_build.yml b/.github/workflows/conda_build.yml
index 2209ade186..d528ee94c2 100644
--- a/.github/workflows/conda_build.yml
+++ b/.github/workflows/conda_build.yml
@@ -1,49 +1,34 @@
 name: Conda Build
 
 on:
+  pull_request:
   push:
     branches:
       - stable
 jobs:
-  build-linux:
+  build:
     runs-on: ubuntu-latest
     defaults:
       run:
         shell: bash -l {0}
     steps:
-      - uses: actions/checkout@v2
-      - uses: conda-incubator/setup-miniconda@v2
-      - name: Conda info
+      - uses: actions/checkout@v4
+      - name: Setup Conda
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          auto-update-conda: false
+          conda-solver: libmamba
+          auto-activate-base: true
+          activate-environment: ""
+      - name: Install Build Tools
+        run: conda install python anaconda-client conda-build
+      - name: Configure Auto-Upload
+        if: github.ref == 'refs/heads/stable'
         run: |
-          conda info
-          conda list
-      - name: Build Binary
-        env: 
-          CONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
-        run: |
-          conda install -y conda-build 
-          conda install -y anaconda-client 
-          conda config --add channels rmg
           conda config --set anaconda_upload yes
-          conda build --token $CONDA_TOKEN --user rmg .conda
-  build-osx:
-    runs-on: macos-latest
-    defaults:
-      run:
-        shell: bash -l {0}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: conda-incubator/setup-miniconda@v2
-      - name: Conda info
-        run: |
-          conda info
-          conda list
       - name: Build Binary
         env: 
           CONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
         run: |
-          conda install -y conda-build 
-          conda install -y anaconda-client 
-          conda config --add channels rmg
-          conda config --set anaconda_upload yes
-          conda build --token $CONDA_TOKEN --user rmg .conda
\ No newline at end of file
+          conda config --add channels conda-forge
+          conda-build --token $CONDA_TOKEN --user rmg .conda