diff --git a/.github/workflows/run-s3-test-push.yml b/.github/workflows/run-s3-test-push.yml
index 7bea5e9e..15a68299 100644
--- a/.github/workflows/run-s3-test-push.yml
+++ b/.github/workflows/run-s3-test-push.yml
@@ -27,7 +27,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
           use-mamba: true
-          mamba-version: "2.0.5"  # https://github.com/conda-incubator/setup-miniconda/issues/392
       - name: Get conda and Python versions
         run: |
           conda --version
@@ -51,7 +50,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
           use-mamba: true
-          mamba-version: "2.0.5"  # https://github.com/conda-incubator/setup-miniconda/issues/392
       - name: Install PyActiveStorage
         run: |
           conda --version
diff --git a/.github/workflows/run-test-push.yml b/.github/workflows/run-test-push.yml
index 5b2cf25d..24e116dd 100644
--- a/.github/workflows/run-test-push.yml
+++ b/.github/workflows/run-test-push.yml
@@ -27,7 +27,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
           use-mamba: true
-          mamba-version: "2.0.5"  # https://github.com/conda-incubator/setup-miniconda/issues/392
       - run: conda --version
       - run: python -V
       - run: pip install -e .
diff --git a/.github/workflows/run-tests-condaforge.yml b/.github/workflows/run-tests-condaforge.yml
new file mode 100644
index 00000000..e447748d
--- /dev/null
+++ b/.github/workflows/run-tests-condaforge.yml
@@ -0,0 +1,80 @@
+name: Test Conda Package
+
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: '0 0 * * *'  # nightly
+
+# Required shell entrypoint to have properly configured bash shell
+defaults:
+  run:
+    shell: bash -l {0}
+
+jobs:
+  linux:
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
+      fail-fast: false
+    name: Linux Python ${{ matrix.python-version }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: conda-incubator/setup-miniconda@v3
+        with:
+          activate-environment: activestorage
+          python-version: ${{ matrix.python-version }}
+          miniforge-version: "latest"
+          use-mamba: true
+      - run: |
+          conda --version
+          mamba --version
+          python -V
+      - run: conda list
+      - run: conda install pyactivestorage
+      - run: |
+          conda install moto
+          conda install pytest
+          conda install pytest-cov
+          conda install pytest-html
+          conda install pytest-metadata
+          conda install pytest-xdist
+      - run: conda list
+      - run: pytest -n 2 -m "not slow" --ignore=tests/test_real_https.py --ignore=tests/test_real_s3.py
+
+  osx:
+    runs-on: "macos-latest"
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
+      fail-fast: false
+    name: OSX Python ${{ matrix.python-version }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: conda-incubator/setup-miniconda@v3
+        with:
+          activate-environment: activestorage
+          python-version: ${{ matrix.python-version }}
+          miniforge-version: "latest"
+          use-mamba: true
+      - run: |
+          conda --version
+          mamba --version
+          python -V
+      - run: conda list
+      - run: conda install -c conda-forge git
+      - run: conda install pyactivestorage
+      - run: |
+          conda install moto
+          conda install pytest
+          conda install pytest-cov 
+          conda install pytest-html 
+          conda install pytest-metadata
+          conda install pytest-xdist
+      - run: pytest -n 2 -m "not slow" --ignore=tests/test_real_https.py --ignore=tests/test_real_s3.py
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 76d411e9..c6193e7e 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -31,7 +31,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
           use-mamba: true
-          mamba-version: "2.0.5"  # https://github.com/conda-incubator/setup-miniconda/issues/392
       - run: conda --version
       - run: python -V
       - run: conda list
@@ -57,7 +56,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
           use-mamba: true
-          mamba-version: "2.0.5"  # https://github.com/conda-incubator/setup-miniconda/issues/392
       - run: conda --version
       - run: python -V
       - run: conda list
diff --git a/.github/workflows/test_s3_minio.yml b/.github/workflows/test_s3_minio.yml
index 21eeb3a4..a5dfe1c1 100644
--- a/.github/workflows/test_s3_minio.yml
+++ b/.github/workflows/test_s3_minio.yml
@@ -31,7 +31,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
           use-mamba: true
-          mamba-version: "2.0.5"  # https://github.com/conda-incubator/setup-miniconda/issues/392
       - name: Get conda and Python versions
         run: |
           conda --version
@@ -55,7 +54,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
           use-mamba: true
-          mamba-version: "2.0.5"  # https://github.com/conda-incubator/setup-miniconda/issues/392
       - name: Install PyActiveStorage
         run: |
           conda --version
diff --git a/README.md b/README.md
index 469b1ad1..70ade6d7 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![made-with-python](https://img.shields.io/badge/Made%20with-Python-1f425f.svg)](https://www.python.org/)
 [![Test](https://github.com/NCAS-CMS/PyActiveStorage/actions/workflows/run-tests.yml/badge.svg)](https://github.com/NCAS-CMS/PyActiveStorage/actions/workflows/run-tests.yml)
 [![codecov](https://codecov.io/gh/NCAS-CMS/PyActiveStorage/graph/badge.svg?token=1olGjnvAOp)](https://codecov.io/gh/NCAS-CMS/PyActiveStorage)
+[![Anaconda-Server Badge](https://anaconda.org/conda-forge/pyactivestorage/badges/version.svg)](https://anaconda.org/conda-forge/pyactivestorage)
 
 ![pyactivestoragelogo](https://raw.githubusercontent.com/NCAS-CMS/PyActiveStorage/main/doc/figures/PyActiveStorage-logo-complete.jpg)
 
@@ -11,6 +12,7 @@
 - [Latest documentation on ReadTheDocs (RTD)](https://pyactivestorage.readthedocs.io/en/latest/)
 - [RTD latest builds](https://app.readthedocs.org/projects/pyactivestorage/)
 - [GHA Tests](https://github.com/NCAS-CMS/PyActiveStorage/actions)
+- [conda-forge feedstock](https://github.com/conda-forge/pyactivestorage-feedstock)
 
 ### Create virtual environment