diff --git a/tools-image/Dockerfile b/tools-image/Dockerfile
index 9f4da05..57c6f83 100644
--- a/tools-image/Dockerfile
+++ b/tools-image/Dockerfile
@@ -86,7 +86,7 @@ RUN mkdir /config
 COPY ./config.yaml /config/manifest.yaml
 COPY ./entrypoint.sh /entrypoint.sh
 COPY ./add-cloud-init.sh /add-cloud-init.sh
-COPY ./os-release.tmpl /os-release.tmpl
+COPY ./kairos-release.tmpl /kairos-release.tmpl
 COPY ./ipxe.tmpl /ipxe.tmpl
 COPY ./update-os-release.sh /update-os-release.sh
 
diff --git a/tools-image/os-release.tmpl b/tools-image/kairos-release.tmpl
similarity index 100%
rename from tools-image/os-release.tmpl
rename to tools-image/kairos-release.tmpl
diff --git a/tools-image/update-os-release.sh b/tools-image/update-os-release.sh
index 8defc8a..00f064f 100755
--- a/tools-image/update-os-release.sh
+++ b/tools-image/update-os-release.sh
@@ -17,7 +17,9 @@
 
 set -ex
 
+[ -f "/workspace/kairos-release" ] && sed -i -n '/KAIROS_/!p' /workspace/kairos-release
+# Clean up old os-release just in case so we dont have stuff lying around
 sed -i -n '/KAIROS_/!p' /workspace/os-release
-envsubst >>/workspace/os-release < /os-release.tmpl
+envsubst >>/workspace/kairos-release < /kairos-release.tmpl
 
-cat /workspace/os-release
+cat /workspace/kairos-release