diff --git a/logstash.yaml b/logstash.yaml
index d8bd6fe008f..0d4dd0b56f5 100644
--- a/logstash.yaml
+++ b/logstash.yaml
@@ -1,6 +1,6 @@
 package:
   name: logstash
-  version: 8.8.1
+  version: "8.7.0" # 8.7.1-r0 and 8.7.0-r1 have been withdrawn, when bumping, avoid these to avoid withdrawing the same package again
   epoch: 0
   description: Logstash - transport and process your logs, events, or other data
   target-architecture:
@@ -25,24 +25,23 @@ environment:
       - openjdk-11
       - ruby-3.1
       - bash
-      - ruby3.1-bundler
 
 pipeline:
   - uses: git-checkout
     with:
       repository: https://github.com/elastic/logstash
       tag: v${{package.version}}
-      expected-commit: f1a41e558cd915ac9d2f91dc3fdd2865cec3343d
+      expected-commit: 82d8400440fea09f84c6e8e549a7a613cb9a5260
 
   - runs: |
       export OSS=true
       export LOGSTASH_SOURCE=1
       export LANG=en_US.UTF-8
-      export GEM_HOME=$PWD/vendor/bundle/jruby/3.1
       export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
       export LS_JAVA_HOME=/usr/lib/jvm/java-11-openjdk
 
       gem install rake
+      gem install bundler
 
       ./gradlew installDevelopmentGems
       rake bootstrap
@@ -53,7 +52,7 @@ pipeline:
       mkdir -p ${{targets.destdir}}/usr/share/java/logstash
       tar --strip-components 1 -C ${{targets.destdir}}/usr/share/java/logstash -xf build/logstash-oss-*-SNAPSHOT-no-jdk.tar.gz
 
-      mkdir -p ${{targets.destdir}}/usr/bin
+      mkdir -p ${{targets.destdir}}/usr/bin/$name
       for i in ${{targets.destdir}}/usr/share/java/logstash/bin/*; do
         name=$(basename $i)
         ln -sf /usr/share/java/logstash/bin/$name ${{targets.destdir}}/usr/bin/$name
@@ -61,6 +60,7 @@ pipeline:
 
 update:
   enabled: true
+  manual: true # avoid creating PRs while build fails on arm
   github:
     identifier: elastic/logstash
     strip-prefix: v
diff --git a/withdrawn-packages.txt b/withdrawn-packages.txt
index 2d97a298b94..4bd8f2f7fea 100644
--- a/withdrawn-packages.txt
+++ b/withdrawn-packages.txt
@@ -7,3 +7,4 @@ ratelimit-0.0_git20230508-r0.apk
 mongo-tools-100.7.1-r0.apk
 ingress-default-backend-1.23.1-r0.apk
 oidc-discovery-provider-1.6.4-r1.apk
+logstash-8.8.1-r0.apk