diff --git a/Dockerfile b/Dockerfile
index b649e14..77b4acb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -83,7 +83,7 @@ RUN \
   ALVERSION=$(cat /kasm_release/conf/database/seed_data/default_properties.yaml |awk '/alembic_version/ {print $2}') && \
   curl -o \
     /tmp/images.tar.gz -L \
-    "https://kasm-ci.s3.amazonaws.com/1.17.0-images-combined.tar.gz" && \
+    "https://kasm-ci.s3.amazonaws.com/${KASM_VERSION}-images-combined.tar.gz" && \
   tar xf \
     /tmp/images.tar.gz -C \
     / && \
@@ -104,6 +104,7 @@ RUN \
     /wizard/ && \
   useradd -u 70 kasm_db && \
   useradd kasm && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apt-get remove -y g++ gcc make && \
   apt-get -y autoremove && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d2782b6..23207d6 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -83,7 +83,7 @@ RUN \
   ALVERSION=$(cat /kasm_release/conf/database/seed_data/default_properties.yaml |awk '/alembic_version/ {print $2}') && \
   curl -o \
     /tmp/images.tar.gz -L \
-    "https://kasm-ci.s3.amazonaws.com/1.17.0-images-combined.tar.gz" && \
+    "https://kasm-ci.s3.amazonaws.com/${KASM_VERSION}-images-combined.tar.gz" && \
   tar xf \
     /tmp/images.tar.gz -C \
     / && \
@@ -104,6 +104,7 @@ RUN \
     /wizard/ && \
   useradd -u 70 kasm_db && \
   useradd kasm && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apt-get remove -y g++ gcc make && \
   apt-get -y autoremove && \
diff --git a/README.md b/README.md
index 77ccbca..2900a0a 100644
--- a/README.md
+++ b/README.md
@@ -313,6 +313,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **22.10.25:** - Update for 1.18.0 release.
 * **08.06.25:** - Deprecate develop branch.
 * **03.06.25:** - Rebase to Ubuntu Noble. Update for 1.17.0 release.
 * **09.11.24:** - Update base image for 1.16.1 release.
diff --git a/readme-vars.yml b/readme-vars.yml
index 5614b50..6ce3914 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -126,6 +126,7 @@ init_diagram: |
   "kasm:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "22.10.25:", desc: "Update for 1.18.0 release."}
   - {date: "08.06.25:", desc: "Deprecate develop branch."}
   - {date: "03.06.25:", desc: "Rebase to Ubuntu Noble. Update for 1.17.0 release."}
   - {date: "09.11.24:", desc: "Update base image for 1.16.1 release."}
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run b/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run
index 57ac17a..f72dd96 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-config-kasm/run
@@ -5,9 +5,12 @@ if [[ ! -d "/opt/docker" ]]; then
     mkdir -p /opt/docker
 fi
 
+# Workaround for running in a rootless docker environment
+sed -i '/set -e/d' /etc/init.d/docker
+
 # Login to Dockerhub
 if [[ -n "${DOCKER_HUB_USERNAME}" ]]; then
-    docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
+    docker login --username "${DOCKER_HUB_USERNAME}" --password "${DOCKER_HUB_PASSWORD}"
 fi
 
 # Generate self cert for wizard
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-kasm-wizard/run b/root/etc/s6-overlay/s6-rc.d/svc-kasm-wizard/run
index c50e440..a3dd2ea 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-kasm-wizard/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-kasm-wizard/run
@@ -2,16 +2,16 @@
 
 # Wait for docker to be up
 while true; do
-    if [ -S "/var/run/docker.sock" ]; then
+    if [[ -S "/var/run/docker.sock" ]]; then
         break
     fi
     sleep 1
 done
 
 # Don't do anything if wizard is disabled
-if [ -f "/opt/NO_WIZARD" ]; then
+if [[ -f "/opt/NO_WIZARD" ]]; then
     sleep infinity
 fi
 
-cd /wizard
+cd /wizard || exit 1
 /usr/bin/node index.js