diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 45a617e..8430e21 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,6 +34,8 @@ jobs:
             BUILD_IMAGE_TAG: jdk8
           - BUILD_IMAGE_DOCKERFILE: builds/debian/Lucee5.Dockerfile
             BUILD_IMAGE_TAG: lucee5
+          - BUILD_IMAGE_DOCKERFILE: builds/debian/Lucee6.Dockerfile
+            BUILD_IMAGE_TAG: lucee6
           - BUILD_IMAGE_DOCKERFILE: builds/debian/LuceeLight.Dockerfile
             BUILD_IMAGE_TAG: lucee-light
           - BUILD_IMAGE_DOCKERFILE: builds/debian/Lucee5Light.Dockerfile
@@ -62,6 +64,8 @@ jobs:
             BUILD_IMAGE_TAG: jre17-ubi9
           - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Lucee5.Dockerfile
             BUILD_IMAGE_TAG: lucee5-ubi9
+          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Lucee6.Dockerfile
+            BUILD_IMAGE_TAG: lucee6-ubi9
           - BUILD_IMAGE_DOCKERFILE: builds/ubi9/LuceeLight.Dockerfile
             BUILD_IMAGE_TAG: lucee-light-ubi9
           - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Lucee5Light.Dockerfile
@@ -93,6 +97,8 @@ jobs:
             BUILD_IMAGE_TAG: jdk8-alpine
           - BUILD_IMAGE_DOCKERFILE: builds/alpine/Lucee5.Dockerfile
             BUILD_IMAGE_TAG: lucee5-alpine
+          - BUILD_IMAGE_DOCKERFILE: builds/alpine/Lucee6.Dockerfile
+            BUILD_IMAGE_TAG: lucee6-alpine
           - BUILD_IMAGE_DOCKERFILE: builds/alpine/LuceeLight.Dockerfile
             BUILD_IMAGE_TAG: lucee-light-alpine
           - BUILD_IMAGE_DOCKERFILE: builds/alpine/Lucee5Light.Dockerfile
diff --git a/builds/alpine/Lucee6.Dockerfile b/builds/alpine/Lucee6.Dockerfile
new file mode 100644
index 0000000..c4c02fd
--- /dev/null
+++ b/builds/alpine/Lucee6.Dockerfile
@@ -0,0 +1,12 @@
+# syntax = edrevo/dockerfile-plus
+INCLUDE+ builds/base/Alpine.Dockerfile
+
+LABEL maintainer "Jon Clausen <jclausen@ortussolutions.com>"
+LABEL repository "https://github.com/Ortus-Solutions/docker-commandbox"
+
+ENV BOX_SERVER_APP_CFENGINE lucee@6.1.0+243
+
+ENV LUCEE_EXTENSIONS D062D72F-F8A2-46F0-8CBC91325B2F067B;version=6.5.2
+
+# WARM UP THE SERVER - we skip the declaration so that the default installed Lucee server will be used
+RUN ${BUILD_DIR}/util/warmup-server.sh
\ No newline at end of file
diff --git a/builds/debian/Lucee6.Dockerfile b/builds/debian/Lucee6.Dockerfile
new file mode 100644
index 0000000..99eae6f
--- /dev/null
+++ b/builds/debian/Lucee6.Dockerfile
@@ -0,0 +1,12 @@
+# syntax = edrevo/dockerfile-plus
+INCLUDE+ builds/base/Dockerfile
+
+LABEL maintainer "Jon Clausen <jclausen@ortussolutions.com>"
+LABEL repository "https://github.com/Ortus-Solutions/docker-commandbox"
+
+ENV BOX_SERVER_APP_CFENGINE lucee@6.1.0+243
+
+ENV LUCEE_EXTENSIONS D062D72F-F8A2-46F0-8CBC91325B2F067B;version=6.5.2
+
+# WARM UP THE SERVER - we skip the declaration so that the default installed Lucee server will be used
+RUN ${BUILD_DIR}/util/warmup-server.sh
\ No newline at end of file
diff --git a/builds/ubi9/Lucee6.Dockerfile b/builds/ubi9/Lucee6.Dockerfile
new file mode 100644
index 0000000..8d8f576
--- /dev/null
+++ b/builds/ubi9/Lucee6.Dockerfile
@@ -0,0 +1,12 @@
+# syntax = edrevo/dockerfile-plus
+INCLUDE+ builds/base/ubi9.Dockerfile
+
+LABEL maintainer "Jon Clausen <jclausen@ortussolutions.com>"
+LABEL repository "https://github.com/Ortus-Solutions/docker-commandbox"
+
+ENV BOX_SERVER_APP_CFENGINE lucee@6.1.0+243
+
+ENV LUCEE_EXTENSIONS D062D72F-F8A2-46F0-8CBC91325B2F067B;version=6.5.2
+
+# WARM UP THE SERVER - we skip the declaration so that the default installed Lucee server will be used
+RUN ${BUILD_DIR}/util/warmup-server.sh
\ No newline at end of file