diff --git a/packages.txt b/packages.txt
index 6eca8ca9d46..5efb751d917 100644
--- a/packages.txt
+++ b/packages.txt
@@ -404,8 +404,7 @@ ruby3.2-bundler
 ruby3.2-async-io
 ruby3.2-cool.io
 ruby3.2-fiber-local
-ruby3.2-fluentd14
-ruby3.2-fluentd15
+ruby3.2-fluentd
 ruby3.2-msgpack
 ruby3.2-oj
 ruby3.2-rexml
diff --git a/ruby3.2-fluentd15.yaml b/ruby3.2-fluentd.yaml
similarity index 92%
rename from ruby3.2-fluentd15.yaml
rename to ruby3.2-fluentd.yaml
index 3a33af28189..8d310d99423 100644
--- a/ruby3.2-fluentd15.yaml
+++ b/ruby3.2-fluentd.yaml
@@ -1,7 +1,7 @@
 package:
-  name: ruby3.2-fluentd15
+  name: ruby3.2-fluentd
   version: 1.16.1
-  epoch: 1
+  epoch: 0
   description: Fluentd is an open source data collector designed to scale and simplify log management. It can collect, process and ship many kinds of data in near real-time.
   copyright:
     - license: Apache-2.0
@@ -28,13 +28,12 @@ environment:
       - ruby-3.2-dev
       - build-base
       - busybox
-      - git
 
 vars:
   gem: fluentd
 
 pipeline:
-  # This package makes use of `git ls-files` in it's gemspec so the git repo
+  # This package makes use of `git ls-files` in its gemspec so the git repo
   # must be checked out in order for the gem to build with all files.
   - uses: git-checkout
     with:
diff --git a/ruby3.2-fluentd14.yaml b/ruby3.2-fluentd14.yaml
deleted file mode 100644
index a24931d615b..00000000000
--- a/ruby3.2-fluentd14.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-package:
-  name: ruby3.2-fluentd14
-  version: 1.14.6
-  epoch: 4
-  description: Fluentd is an open source data collector designed to scale and simplify log management. It can collect, process and ship many kinds of data in near real-time.
-  target-architecture:
-    - all
-  copyright:
-    - paths:
-        - '*'
-      attestation: TODO
-      license: Apache-2.0
-  dependencies:
-    runtime:
-      - ruby-3.2
-      - ruby3.2-bundler
-      - ruby3.2-cool.io
-      - ruby3.2-http_parser.rb
-      - ruby3.2-msgpack
-      - ruby3.2-serverengine
-      - ruby3.2-sigdump
-      - ruby3.2-strptime
-      - ruby3.2-tzinfo
-      - ruby3.2-tzinfo-data
-      - ruby3.2-webrick
-      - ruby3.2-yajl-ruby
-
-environment:
-  contents:
-    packages:
-      - ca-certificates-bundle
-      - ruby-3.2
-      - ruby-3.2-dev
-      - build-base
-      - busybox
-      - git
-
-vars:
-  gem: fluentd
-
-pipeline:
-  - uses: git-checkout
-    with:
-      destination: ${{vars.gem}}
-      expected-commit: c0f48a0080550eff6aa6fa19d269e480684e7a45
-      repository: https://github.com/fluent/fluentd.git
-      tag: v${{package.version}}
-
-  - working-directory: ${{vars.gem}}
-    pipeline:
-      # Since we are working in the git repo the patch file is located one
-      # directory up from here.
-      - uses: patch
-        with:
-          patches: ../CVE-2022-39379.patch
-      - uses: ruby/build
-        with:
-          gem: ${{vars.gem}}
-      - uses: ruby/install
-        with:
-          gem: ${{vars.gem}}
-          version: ${{package.version}}
-
-  - uses: ruby/clean
-
-  - runs: |-
-      GEM_DIR=${{targets.destdir}}$(ruby -e 'puts Gem.default_dir')/gems/${{vars.gem}}-${{package.version}}
-      rm -rf ${GEM_DIR}/test \
-             ${GEM_DIR}/docs \
-             ${GEM_DIR}/*.md \
-             ${GEM_DIR}/.github
-
-update:
-  enabled: true
-  github:
-    identifier: fluent/fluentd
-    strip-prefix: v
-    tag-filter: "v1.14"