diff --git a/Dockerfile b/Dockerfile
index a70e79f..e89f68c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 510c3cc..59ae458 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
 
 # set version label
 ARG BUILD_DATE
diff --git a/README.md b/README.md
index 32d1254..c5b8cb2 100644
--- a/README.md
+++ b/README.md
@@ -252,6 +252,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **12.07.23:** - Rebase to Alpine 3.18.
 * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **05.03.23:** - Rebase to Alpine 3.17.
 * **10.10.22:** - Rebasing to alpine 3.16, migrate to s6v3.
diff --git a/readme-vars.yml b/readme-vars.yml
index bb1ade6..af9f44a 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -61,6 +61,7 @@ app_setup_block: |
   If no value is set it will default to 512MB.
 # changelog
 changelogs:
+  - {date: "12.07.23:", desc: "Rebase to Alpine 3.18."}
   - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "05.03.23:", desc: "Rebase to Alpine 3.17."}
   - {date: "10.10.22:", desc: "Rebasing to alpine 3.16, migrate to s6v3."}
diff --git a/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/type b/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/type
index 3d92b15..bdd22a1 100644
--- a/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/type
+++ b/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/type
@@ -1 +1 @@
-oneshot
\ No newline at end of file
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/up b/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/up
index a618ca3..57f2b63 100644
--- a/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/up
+++ b/root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/up
@@ -1 +1 @@
-/etc/s6-overlay/s6-rc.d/init-ubooquity-config/run
\ No newline at end of file
+/etc/s6-overlay/s6-rc.d/init-ubooquity-config/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/type b/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/type
index 1780f9f..5883cff 100644
--- a/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/type
+++ b/root/etc/s6-overlay/s6-rc.d/svc-ubooquity/type
@@ -1 +1 @@
-longrun
\ No newline at end of file
+longrun