diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4574e507a3..c07078d055 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -74,21 +74,21 @@ jobs:
           path: ${{ github.workspace }}
 
       - name: Upload agent binaries as artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: elastic-apm-agent
           path: |
             ./elastic-apm-agent/target/elastic-apm-agent-*.jar
             !./**/*-sources.jar
       - name: Upload agent java 8 binaries as artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: elastic-apm-agent-java8
           path: |
             ./elastic-apm-agent-java8/target/elastic-apm-agent-java8-*.jar
             !./**/*-sources.jar
       - name: Upload agent attach CLI artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apm-agent-attach-cli
           path: |
@@ -96,28 +96,28 @@ jobs:
             !./**/*-sources.jar
             !./**/*-tests.jar
       - name: Upload agent attach artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apm-agent-attach
           path: |
             ./apm-agent-attach/target/apm-agent-attach-*.jar
             !./**/*-sources.jar
       - name: Upload agent API artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apm-agent-api
           path: |
             ./apm-agent-api/target/apm-agent-api-*.jar
             !./**/*-sources.jar
       - name: Upload agent plugin SDK artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apm-agent-plugin-sdk
           path: |
             ./apm-agent-plugin-sdk/target/apm-agent-plugin-sdk-*.jar
             !./**/*-sources.jar
       - name: Upload benchmark binaries as artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apm-agent-benchmarks
           path: |
@@ -160,7 +160,7 @@ jobs:
           command: ./mvnw test -DargLine="-Delastic.apm.overwrite.config.docs=false"
       - name: Store test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: |
@@ -198,7 +198,7 @@ jobs:
           command: ./mvnw -q -P ci-non-application-server-integration-tests verify
       - name: Store test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: |
@@ -237,7 +237,7 @@ jobs:
           command: ./mvnw -q -P ci-application-server-integration-tests verify
       - name: Store test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: |
@@ -278,7 +278,7 @@ jobs:
         run: ./mvnw test
       - name: Store test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: |
@@ -314,7 +314,7 @@ jobs:
         run: ./mvnw test -Delastic.jdkCompatibilityTest=true -Dtest_java_binary=${{ env.TEST_JAVA_BINARY }}
       - name: Store test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5f80c6475d..376b94388b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -69,7 +69,7 @@ jobs:
           ref: ${{ inputs.branch }}
           token: ${{ env.GITHUB_TOKEN }}
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: ${{ env.JAVA_DIST }}
@@ -219,7 +219,7 @@ jobs:
         with:
           ref: ${{ env.TAG_NAME }}
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: ${{ env.JAVA_DIST }}
@@ -242,7 +242,7 @@ jobs:
           VERSION=${VERSION//./-}
           
           ELASTIC_LAYER_NAME="elastic-apm-java-${VERSION}" .ci/publish-aws.sh
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: arn-file
           path: .ci/.arn-file.md