diff --git a/installers-conda/build_conda_pkgs.py b/installers-conda/build_conda_pkgs.py
index 4f52b937b53..b56c6c003ec 100644
--- a/installers-conda/build_conda_pkgs.py
+++ b/installers-conda/build_conda_pkgs.py
@@ -212,6 +212,11 @@ def _patch_source(self):
         )
         file.write_text(file_text)
 
+        self.repo.git.diff(
+            output=(self._fdstk_path / "recipe" / "version.patch").as_posix()
+        )
+        self.repo.git.stash()
+
     def _patch_meta(self, meta):
         # Get current Spyder requirements
         yaml = YAML()
@@ -239,6 +244,10 @@ def _patch_meta(self, meta):
         meta = re.sub(r'^(requirements:\n(.*\n)+  run:\n)(    .*\n)+',
                       rf'\g<1>    - {cr_string}\n', meta, flags=re.MULTILINE)
 
+        # Add version patch
+        meta = re.sub(r'^(source:\n(.*\n)*  patches:\n)',
+                      r'\g<1>    - version.patch\n',
+                      meta, flags=re.MULTILINE)
         return meta
 
 
diff --git a/installers-conda/certkeychain.sh b/installers-conda/certkeychain.sh
index e1a145d2a5b..9da68641054 100755
--- a/installers-conda/certkeychain.sh
+++ b/installers-conda/certkeychain.sh
@@ -39,7 +39,6 @@ cleanup(){
     log "Removing $KEYCHAIN..."
     security list-keychain -s login.keychain
     security delete-keychain $KEYCHAIN
-    rm -rf $CERTFILE
 }
 
 while getopts "hc" option; do
@@ -70,6 +69,7 @@ for cert in ${CERTS[@]}; do
         _cert=$cert
     else
         log "Decoding/importing base64 cert..."
+        mkdir -p $SPYTMPDIR
         echo $cert | base64 --decode > $CERTFILE
         _cert=$CERTFILE
     fi