diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index 9bd65bed5..c91c2132d 100644
--- a/ci/release/Jenkinsfile
+++ b/ci/release/Jenkinsfile
@@ -91,7 +91,7 @@ pipeline {
 											 usernamePassword(credentialsId: 'central.sonatype.com', passwordVariable: 'JRELEASER_MAVENCENTRAL_TOKEN', usernameVariable: 'JRELEASER_MAVENCENTRAL_USERNAME'),
 											 usernamePassword(credentialsId: 'gradle-plugin-portal-api-key', passwordVariable: 'GRADLE_PUBLISH_SECRET', usernameVariable: 'GRADLE_PUBLISH_KEY'),
 											 string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')]) {
-								sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
+								sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate-ci.frs.sourceforge.net']) {
 									sh 'cat $HOME/.ssh/config'
 									dir('.release/scripts') {
 										sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git .'
diff --git a/gradle/pom.xml b/gradle/pom.xml
index d55c976f7..fb18015e8 100644
--- a/gradle/pom.xml
+++ b/gradle/pom.xml
@@ -243,6 +243,9 @@
                     <value>true</value>
                 </property>
             </activation>
+            <properties>
+                <deploy.publish.gradle.plugin>clean</deploy.publish.gradle.plugin>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -255,7 +258,7 @@
                                 <configuration>
                                     <executable>${gradle.executable}</executable>
                                     <arguments>
-                                        <argument>publishPlugins</argument>
+                                        <argument>${deploy.publish.gradle.plugin}</argument>
                                         <argument>publishPluginMavenPublicationToStagingRepository</argument>
                                         <argument>-PprojectVersion=${project.version}</argument>
                                         <argument>-Ph2Version=${h2.version}</argument>
@@ -273,6 +276,18 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>plugin-release</id>
+            <activation>
+                <property>
+                    <name>publishPlugin</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <deploy.publish.gradle.plugin>publishPlugins</deploy.publish.gradle.plugin>
+            </properties>
+        </profile>
     </profiles>
 
 </project>