diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
index b0f7fc6d7590313feee31977ae3f20e07e6223d3..1ed26afb266a90d6ec5f85663f7f75de1ef50754 100644
--- a/ci/Jenkinsfile
+++ b/ci/Jenkinsfile
@@ -49,6 +49,8 @@ pipeline {
           dir('java') {
             mvn goal: 'clean verify -P sign', dependencies: 'dependencies/maven.deps'
           }
+          
+          archiveArtifacts 'java/org.eclipse.set.browser.releng.repository/target/*.zip'
         }
       }
     }
@@ -61,28 +63,17 @@ pipeline {
       }
     }
 
-    stage('Remove Old Snapshot') {
-      when {
-        branch 'main'
-      }
-
-      steps {
-        removeOldSnapshot repo: 'browser'
-      }
-    }
-
     stage('Deploy Snapshot') {
       when {
         anyOf {
           buildingTag()
           branch 'main'
-          branch pattern: 'release/[0-9.]+', comparator: 'REGEXP'          
-          branch pattern: 'feature/\\w+', comparator: 'REGEXP'
+          branch pattern: 'release/[0-9.]+', comparator: 'REGEXP'
         }
       }
 
       steps {
-        deployP2Site name: "browser/${BRANCH_NAME}", path: 'java/org.eclipse.set.browser.releng.repository/target/repository'
+        deployP2Site name: 'browser', branch: BRANCH_NAME, path: 'java/org.eclipse.set.browser.releng.repository/target/repository'
       }
     }
   }
diff --git a/ci/Jenkinsfile.cef b/ci/Jenkinsfile.cef
index 25a5fdc7119e66eda9ac4485ebc50c185a61364d..c09d63d4231cffbbe8914a18a0f6aabe2e1d9d00 100644
--- a/ci/Jenkinsfile.cef
+++ b/ci/Jenkinsfile.cef
@@ -35,16 +35,6 @@ pipeline {
       }
     }
 
-
-    stage('Remove Old Snapshot') {
-      when {
-        branch 'main'
-      }
-      steps {
-        removeOldSnapshot repo: 'browser-cef'
-      }
-    }
-
     stage('Deploy Snapshot')
     {
       when {
@@ -52,12 +42,11 @@ pipeline {
           buildingTag()
           branch 'main'
           branch pattern: 'release/[0-9.]+', comparator: 'REGEXP'
-          branch pattern: 'feature/\\w+', comparator: 'REGEXP'
         }
       }
 
       steps {
-        deployP2Site name: 'browser-cef/${BRANCH_NAME}', path: 'java-cef/org.eclipse.set.browser.cef.releng.repository/target/repository' 
+        deployP2Site name: 'browser-cef', branch: BRANCH_NAME, path: 'java-cef/org.eclipse.set.browser.cef.releng.repository/target/repository' 
       }
     }
   }