diff --git a/Jenkinsfile b/Jenkinsfile
index 288e152..44c9aac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,19 @@ pipeline {
     }
 
     stages {
+
         stage('Prepare Environment') {
+            when {
+                anyOf {
+                    allOf {
+                        branch 'master'
+                        triggeredBy 'UserIdCause' // Manual trigger on master
+                    }
+                    allOf {
+                        branch 'latest'
+                    }
+                }
+            }            
             steps {
                 script {
                     sh 'git config --global --add safe.directory $(pwd)'
@@ -41,11 +53,14 @@ pipeline {
             
         stage('Beta Release') {
             when {
-                branch 'master'
-            }            
+                allOf {
+                    branch 'master'
+                    triggeredBy 'UserIdCause' // Manual "Build Now"
+                }
+            }           
             steps {
                 sh '''
-                sed -i -E 's/^(name *= *")superclient(")/\\1superclient-beta\\2/' pyproject.toml
+                sed -i -E 's/^(name *= *")superstream-clients(")/\\1superstream-clients-beta\\2/' pyproject.toml
                 '''                
                 sh 'pip install --quiet build twine'
                 sh 'python -m build'
@@ -106,7 +121,7 @@ pipeline {
                 }                
                 withCredentials([string(credentialsId: 'gh_token', variable: 'GH_TOKEN')]) {
                 sh """
-                gh release create $versionTag dist/superstream_confluent_kafka-${env.versionTag}.tar.gz --generate-notes
+                gh release create $versionTag dist/superstream_clients-${env.versionTag}.tar.gz --generate-notes
                 """
                 }                
             }