diff --git a/.github/actions_build_conda.sh b/.github/actions_build_conda.sh
deleted file mode 100755
index dfa4458..0000000
--- a/.github/actions_build_conda.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# This file is managed by 'repo_helper'. Don't edit it directly.
-
-set -e -x
-
-python -m mkrecipe --type wheel || exit 1
-
-# Switch to miniconda
-source "/home/runner/miniconda/etc/profile.d/conda.sh"
-hash -r
-conda activate base
-conda config --set always_yes yes --set changeps1 no
-conda update conda
-conda install conda-build=3.21.0
-conda info -a
-
-conda config --add channels conda-forge || exit 1
-conda config --add channels domdfcoding || exit 1
-conda config --remove channels defaults
-
-conda build conda -c conda-forge -c domdfcoding --output-folder conda/dist --skip-existing
-
-exit 0
diff --git a/.github/actions_deploy_conda.sh b/.github/actions_deploy_conda.sh
deleted file mode 100755
index 9dbbfd3..0000000
--- a/.github/actions_deploy_conda.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# This file is managed by 'repo_helper'. Don't edit it directly.
-
-set -e -x
-
-# Switch to miniconda
-source "/home/runner/miniconda/etc/profile.d/conda.sh"
-hash -r
-conda activate base
-conda config --set always_yes yes --set changeps1 no
-conda install conda=4.8.5 anaconda-client
-conda info -a
-
-for f in conda/dist/noarch/consolekit-*.tar.bz2; do
-  [ -e "$f" ] || continue
-  echo "$f"
-  conda install "$f" || exit 1
-  echo "Deploying to Anaconda.org..."
-  anaconda -t "$ANACONDA_TOKEN" upload "$f" || exit 1
-  echo "Successfully deployed to Anaconda.org."
-done
-
-exit 0
diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml
index b5f8028..8a9907b 100644
--- a/.github/workflows/conda_ci.yml
+++ b/.github/workflows/conda_ci.yml
@@ -39,9 +39,9 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install --upgrade "whey-conda" "flit-core<4,>=3.2"
           # $CONDA is an environment variable pointing to the root of the miniconda directory
+          $CONDA/bin/conda update -n base conda
           $CONDA/bin/conda config --add channels conda-forge
           $CONDA/bin/conda config --add channels domdfcoding
-          $CONDA/bin/conda update -n base conda
 
       - name: "Build and index channel"
         run: |
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
index 46d2d18..d15e378 100644
--- a/.github/workflows/python_ci_linux.yml
+++ b/.github/workflows/python_ci_linux.yml
@@ -187,22 +187,46 @@ jobs:
         with:
           python-version: 3.8
 
+      - name: Setup Conda
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: env
+          conda-build-version: 3.21.0
+
       - name: Install dependencies 🔧
         run: |
+          python -VV
+          python -m site
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install --upgrade "mkrecipe" "flit-core<4,>=3.2"
+          # $CONDA is an environment variable pointing to the root of the miniconda directory
+          $CONDA/bin/conda config --set always_yes yes --set changeps1 no
+          $CONDA/bin/conda update -n base conda
+          $CONDA/bin/conda info -a
+          $CONDA/bin/conda config --add channels conda-forge
+          $CONDA/bin/conda config --add channels domdfcoding
 
-          wget https://repo.anaconda.com/miniconda/Miniconda3-py38_4.10.3-Linux-x86_64.sh -O miniconda.sh
-          bash miniconda.sh -b -p $HOME/miniconda
+          $CONDA/bin/conda config --remove channels defaults
 
-      - name: Build Conda 📦
+      - name: Build Conda Package 📦
         run: |
-          chmod +x .github/actions_build_conda.sh
-          bash .github/actions_build_conda.sh
+          python -m mkrecipe --type wheel || exit 1
+          $CONDA/bin/conda build conda -c conda-forge -c domdfcoding --output-folder conda/dist
 
-      - name: Deploy Conda 🚀
+      - name: Deploy Conda Package 🚀
+        if: startsWith(github.ref, 'refs/tags/')
         run: |
-          chmod +x .github/actions_deploy_conda.sh
-          bash .github/actions_deploy_conda.sh
+          $CONDA/bin/conda config --set always_yes yes --set changeps1 no
+          $CONDA/bin/conda install anaconda-client
+          $CONDA/bin/conda info -a
+
+          for f in conda/dist/noarch/consolekit-*.tar.bz2; do
+            [ -e "$f" ] || continue
+            echo "$f"
+            conda install "$f" || exit 1
+            echo "Deploying to Anaconda.org..."
+            $CONDA/bin/anaconda -t "$ANACONDA_TOKEN" upload "$f" || exit 1
+            echo "Successfully deployed to Anaconda.org."
+          done
         env:
           ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}