diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index c20c3c3..c83d29a 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -5,7 +5,7 @@
 <!-- For use in commit message, wrap at 72 chars. 72 chars is here: -->
 - *Category*: <!-- one of bugfix, feature, refactor, POC, CI/infrastructure, documentation, 
                    revert, test, release, other/misc -->
-- *JIRA issue*: [MIC-XYZ](https://jira.ihme.washington.edu/browse/MIC-XYZ)
+- *JIRA issue*: https://jira.ihme.washington.edu/browse/MIC-XYZ
 
 ### Changes and notes
 <!-- 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ba619d5..146edee 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,7 @@
+**4.1.1 - 12/2/24**
+
+ - Properly clean up Jenkins workspaces
+
 **4.1.0 - 11/06/24**
 
  - Drop support for Python 3.9
diff --git a/Jenkinsfile b/Jenkinsfile
index 2d261e2..a368268 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -203,8 +203,6 @@ pipeline {
         } // stages bracket within Python matrix
         post {
           always {
-            sh "${ACTIVATE} && make clean"
-            sh "rm -rf ${CONDA_ENV_PATH}"
             // Generate a message to send to Slack.
             script {
               if (env.BRANCH == "main") {
@@ -226,9 +224,6 @@ pipeline {
                 Build details: <${env.BUILD_URL}/console|See in web console>
             """.stripIndent()
             }
-
-            // Delete the workspace directory.
-            deleteDir()
           }
           failure {
             echo "This build triggered by ${developerID} failed on ${GIT_BRANCH}. Sending a failure message to Slack."
@@ -250,8 +245,24 @@ pipeline {
               }
             }
           }
+          cleanup {  // cleanup for python matrix workspaces
+            sh "${ACTIVATE} && make clean"
+            sh "rm -rf ${CONDA_ENV_PATH}"
+            cleanWs()
+            dir("${WORKSPACE}@tmp"){
+              deleteDir()
+            }
+          }
         } // post bracket
       } // Python matrix bracket
     } // Python matrix stage bracket
   } // stages bracket
+  post {
+    cleanup { // cleanup for outer workspace
+      cleanWs()
+      dir("${WORKSPACE}@tmp"){
+        deleteDir()
+      }
+    }
+  }
 }
\ No newline at end of file