diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 73d59f93e556..19e8c71a9f0a 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -80,10 +80,10 @@ jobs:
         path: ./gdal-feedstock/packages/
 
     - name: Deploy to gdal-master Conda channel
-      if: github.ref == 'refs/heads/master'
+      if: github.repository == 'OSGeo/GDAL' && github.ref == 'refs/heads/master'
       shell: bash -l {0}
       env:
         ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
       run: |
-          source ../ci/travis/conda/upload.sh || true
+          source ../ci/travis/conda/upload.sh
       working-directory: ./gdal-feedstock
diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh
index 8d9d7217fc43..bdcf5b59e63d 100755
--- a/ci/travis/conda/setup.sh
+++ b/ci/travis/conda/setup.sh
@@ -22,6 +22,10 @@ cd gdal-feedstock
 patch -p1 < ../ci/travis/conda/libgdal-adbc.patch
 patch -p1 < ../ci/travis/conda/muparser.patch
 
+# Patch version = "X.Y.Z" to "X.Y.99"
+sed 's/version = "\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)"/version = "\1.\2.99"/' < recipe/meta.yaml > meta.yaml
+mv meta.yaml recipe/meta.yaml
+
 cat > recipe/recipe_clobber.yaml <<EOL
 source:
   path: ../../../gdal
diff --git a/ci/travis/conda/upload.sh b/ci/travis/conda/upload.sh
index ccebfd8c5527..ed490c5bc951 100755
--- a/ci/travis/conda/upload.sh
+++ b/ci/travis/conda/upload.sh
@@ -1,20 +1,22 @@
 #!/bin/bash
 
+set -e
 
 if [ -z "${ANACONDA_TOKEN+x}" ]
 then
-    echo "Anaconda token is not set, not uploading"
-    exit 0;
+    echo "Anaconda token is not set!"
+    exit 1
 fi
 
 ls
 pwd
 find .
 
-if [ -z "${ANACONDA_TOKEN}" ]
-then
-    echo "Anaconda token is empty, not uploading"
-    exit 0;
+if [[ -n $(find . -name "*gdal*.conda") ]]; then
+  echo "Found packages to upload"
+else
+  echo "No packages matching *gdal*.conda to upload found"
+  exit 1
 fi
 
 echo "Anaconda token is available, attempting to upload"