diff --git a/pom.xml b/pom.xml
index a344142..1ee2f23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.jfrog.bamboo</groupId>
     <artifactId>bamboo-jfrog-plugin</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 
     <organization>
         <name>JFrog Ltd</name>
@@ -30,7 +30,7 @@
     <packaging>atlassian-plugin</packaging>
 
     <properties>
-        <bamboo.version>9.3.3</bamboo.version>
+        <bamboo.version>9.6.2</bamboo.version>
         <bamboo.data.version>${bamboo.version}</bamboo.data.version>
         <amps.version>8.11.4</amps.version>
         <atlassian.spring.scanner.version>3.0.3</atlassian.spring.scanner.version>
@@ -41,7 +41,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <!-- https://mvnrepository.com/artifact/org.jfrog.buildinfo/build-info-extractor -->
-        <buildinfo.version>2.41.6</buildinfo.version>
+        <buildinfo.version>2.41.16</buildinfo.version>
     </properties>
 
     <profiles>
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>org.jfrog.artifactory.client</groupId>
             <artifactId>artifactory-java-client-api</artifactId>
-            <version>2.14.0</version>
+            <version>2.17.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/jfrog/bamboo/PostBuildAction.java b/src/main/java/org/jfrog/bamboo/AgentBuildProcessor.java
similarity index 82%
rename from src/main/java/org/jfrog/bamboo/PostBuildAction.java
rename to src/main/java/org/jfrog/bamboo/AgentBuildProcessor.java
index 2444ed0..3a304c3 100644
--- a/src/main/java/org/jfrog/bamboo/PostBuildAction.java
+++ b/src/main/java/org/jfrog/bamboo/AgentBuildProcessor.java
@@ -1,6 +1,6 @@
 package org.jfrog.bamboo;
 
-import com.atlassian.bamboo.build.CustomPostBuildCompletedAction;
+import com.atlassian.bamboo.build.CustomBuildProcessor;
 import com.atlassian.bamboo.v2.build.BuildContext;
 import com.atlassian.bamboo.variable.CustomVariableContext;
 import org.codehaus.plexus.util.FileUtils;
@@ -9,7 +9,12 @@
 
 import java.io.IOException;
 
-public class PostBuildAction implements CustomPostBuildCompletedAction {
+/**
+ * Post-build action that deletes the temporary JFrog build directory,
+ * executed on the agent side (remote or local) to make sure we have
+ * access to the temp folder we created.
+ */
+public class AgentBuildProcessor implements CustomBuildProcessor {
     private BuildContext buildContext;
     private CustomVariableContext customVariableContext;
 
diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
index 7139778..36b741b 100644
--- a/src/main/resources/atlassian-plugin.xml
+++ b/src/main/resources/atlassian-plugin.xml
@@ -17,11 +17,12 @@
         <resource type="download" name="icon" location="/images/jfrogLogo.png"/>
     </taskType>
 
-    <postBuildCompletedAction
-            key="PostBuildAction"
-            class="org.jfrog.bamboo.PostBuildAction">
+    <!-- buildProcessor Occurs on the Agent (both local and remote) after the builder has run. -->
+    <buildProcessor
+            key="AgentPostBuildAction"
+            class="org.jfrog.bamboo.AgentBuildProcessor">
         <description>Cleans up the temporary JFrog directory when the build is completed</description>
-    </postBuildCompletedAction>
+    </buildProcessor>
 
     <!-- Admin Configurations -->
     <component name="JFrog Server Configuration Management Component" key="jfrogServerConfigManager"