diff --git a/.final_builds/packages/bosh_aws_cpi/index.yml b/.final_builds/packages/bosh_aws_cpi/index.yml
index 15b20aa7..a0f88a7a 100644
--- a/.final_builds/packages/bosh_aws_cpi/index.yml
+++ b/.final_builds/packages/bosh_aws_cpi/index.yml
@@ -207,6 +207,10 @@ builds:
     version: cec54b1e90f27b994625ef4f4f81cc11d9d4fc7f
     blobstore_id: 71b341ec-a567-4191-ae32-9231840f7d04
     sha1: fc9e5c54d429192f2574261a0d6756dae8b108b5
+  d03a818f9b99be1903601b822f51c04257e48352eabf22d960b9bb22ac31ff8a:
+    version: d03a818f9b99be1903601b822f51c04257e48352eabf22d960b9bb22ac31ff8a
+    blobstore_id: 291d58a9-4145-4f40-51ce-467dd742b22e
+    sha1: sha256:ca056cf9267cd2bce314b2a692b9b3a2b7473cd949b652d151e79430b314dd99
   d30fd4f6cb22a5ad904dfe91d7499e061f1a2f54:
     version: d30fd4f6cb22a5ad904dfe91d7499e061f1a2f54
     blobstore_id: c5a9ba73-5b76-4a94-b143-ddd9768961a3
diff --git a/releases/bosh-aws-cpi/bosh-aws-cpi-87.yml b/releases/bosh-aws-cpi/bosh-aws-cpi-87.yml
new file mode 100644
index 00000000..2489748c
--- /dev/null
+++ b/releases/bosh-aws-cpi/bosh-aws-cpi-87.yml
@@ -0,0 +1,28 @@
+name: bosh-aws-cpi
+version: "87"
+commit_hash: 236b167
+uncommitted_changes: false
+jobs:
+- name: aws_cpi
+  version: 350c512266d8ff855ec69e5813cba4b7eeb82f39ec37b8dd903c24b55eebd2ed
+  fingerprint: 350c512266d8ff855ec69e5813cba4b7eeb82f39ec37b8dd903c24b55eebd2ed
+  sha1: sha256:141a37358aaf62378b73f6aa40b44d65c71e52f5703fa84caae1c43d694bced4
+  packages:
+  - ruby-2.7.3-r0.43.0
+  - bosh_aws_cpi
+packages:
+- name: bosh_aws_cpi
+  version: d03a818f9b99be1903601b822f51c04257e48352eabf22d960b9bb22ac31ff8a
+  fingerprint: d03a818f9b99be1903601b822f51c04257e48352eabf22d960b9bb22ac31ff8a
+  sha1: sha256:ca056cf9267cd2bce314b2a692b9b3a2b7473cd949b652d151e79430b314dd99
+  dependencies:
+  - ruby-2.7.3-r0.43.0
+- name: ruby-2.7.3-r0.43.0
+  version: 99c4d7fe18ef5287f062b73101b2b697fca340e7eac03b3ee87284b71e1c18d8
+  fingerprint: 99c4d7fe18ef5287f062b73101b2b697fca340e7eac03b3ee87284b71e1c18d8
+  sha1: sha256:2507840353929a72a2378481168e6d4ae1f2faa47939dfabb358a4724c1b634e
+  dependencies: []
+license:
+  version: 6904efc3d7f9a0daee5862166c3e7a4481a96c351e1615ccbcc79ff4b7e8826e
+  fingerprint: 6904efc3d7f9a0daee5862166c3e7a4481a96c351e1615ccbcc79ff4b7e8826e
+  sha1: sha256:0c7d15923caf9f418bf56cbbc26892984ccfb619444de68dd56b767726255f1b
diff --git a/releases/bosh-aws-cpi/index.yml b/releases/bosh-aws-cpi/index.yml
index 3dc06742..92308df8 100644
--- a/releases/bosh-aws-cpi/index.yml
+++ b/releases/bosh-aws-cpi/index.yml
@@ -5,6 +5,8 @@ builds:
     version: "33"
   094674e0-8807-4538-bd45-2339a6aed8ff:
     version: "59"
+  096032b3-ba40-4a08-44c7-1aca571c2fef:
+    version: "87"
   10c73841-8831-425f-9cda-0f2ae0134a75:
     version: "4"
   10db9505-fa4f-44ba-91e0-389841507343: