diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 4f7cf67..ea08c12 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -11,7 +11,7 @@ jobs:
         runs-on: ubuntu-latest
         env:
           DOCKER_IMAGE: ortussolutions/commandbox
-          COMMANDBOX_VERSION: 6.0.0-alpha
+          COMMANDBOX_VERSION: 5.9.0
         strategy:
             matrix:
                 include:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4ba5eb6..ba36443 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,8 +32,8 @@ jobs:
                       BUILD_IMAGE_TAG: adobe2018
                     - BUILD_IMAGE_DOCKERFILE: builds/debian/Adobe2021.Dockerfile
                       BUILD_IMAGE_TAG: adobe2021
-                    - BUILD_IMAGE_DOCKERFILE: builds/debian/Adobe2023.Dockerfile
-                      BUILD_IMAGE_TAG: adobe2023
+                    # - BUILD_IMAGE_DOCKERFILE: builds/debian/Adobe2023.Dockerfile
+                    #   BUILD_IMAGE_TAG: adobe2023
                       
                     # ubi9 Builds
                     - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Base.Dockerfile
@@ -52,8 +52,8 @@ jobs:
                       BUILD_IMAGE_TAG: adobe2018-ubi9
                     - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Adobe2021.Dockerfile
                       BUILD_IMAGE_TAG: adobe2021-ubi9
-                    - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Adobe2023.Dockerfile
-                      BUILD_IMAGE_TAG: adobe2023-ubi9
+                    # - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Adobe2023.Dockerfile
+                    #   BUILD_IMAGE_TAG: adobe2023-ubi9
 
                     # Alpine builds
                     # Note: No JDK builders currently support alpine with ARM
@@ -75,8 +75,8 @@ jobs:
                       BUILD_IMAGE_TAG: adobe2018-alpine
                     - BUILD_IMAGE_DOCKERFILE: builds/alpine/Adobe2021.Dockerfile
                       BUILD_IMAGE_TAG: adobe2021-alpine
-                    - BUILD_IMAGE_DOCKERFILE: builds/alpine/Adobe2023.Dockerfile
-                      BUILD_IMAGE_TAG: adobe2023-alpine
+                    # - BUILD_IMAGE_DOCKERFILE: builds/alpine/Adobe2023.Dockerfile
+                    #   BUILD_IMAGE_TAG: adobe2023-alpine
 
         steps:
             - name: Checkout
@@ -96,7 +96,7 @@ jobs:
               env:
                   DOCKER_IMAGE: ortussolutions/commandbox
                   BUILD_IMAGE_TAG: ${{ matrix.BUILD_IMAGE_TAG }}
-                  COMMANDBOX_VERSION: 6.0.0-alpha
+                  COMMANDBOX_VERSION: 5.9.0
                   IMAGE_VERSION: 3.7.4
               run: |
                   # Tag Builds
diff --git a/.github/workflows/scans.yml b/.github/workflows/scans.yml
index 14f552f..beb7c19 100644
--- a/.github/workflows/scans.yml
+++ b/.github/workflows/scans.yml
@@ -13,7 +13,7 @@ jobs:
         runs-on: ubuntu-latest
         env:
           DOCKER_IMAGE: ortussolutions/commandbox
-          COMMANDBOX_VERSION: 6.0.0-alpha
+          COMMANDBOX_VERSION: 5.9.0
         strategy:
             matrix:
               include:
diff --git a/changelog.md b/changelog.md
index 64dac62..58adc64 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,9 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ----
-## [5.8.0/3.7.4] - Unreleased
+## [5.8.0/3.7.4] - 2023-05-02
 ### Changed
 - Removed arm/v7 ( 32 bit ) support due to JDK17 requirements
+- CommandBox binary updated to `5.9.0`
 ## [5.8.0/3.7.3] - 2023-03-23
 ### Fixed
 - Fixes an issue where CLI ID files were not being deleted after installing commandbox and warming up the server