diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b42e966..17aa4d58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased] (Available through Edge Tag)
+- No unreleased changes so far
+
+## [0.9.5] - 2021-11-01
+### Fixed
+- Changed Ubuntu Image from 21.04 to 21.10 for better Raspberry Pi support
+
 ### Changed
 - Updated API to 0.22.0
 
@@ -185,7 +191,8 @@ This is a complete rewrite of VWsFriend using a self developed API. It drops ioB
 ## [0.1.0] - 2021-04-22
 Initial release to enable "latest" tag on dockerhub
 
-[unreleased]: https://github.com/tillsteinbach/VWsFriend/compare/v0.9.4...HEAD
+[unreleased]: https://github.com/tillsteinbach/VWsFriend/compare/v0.9.5...HEAD
+[0.9.5]: https://github.com/tillsteinbach/VWsFriend/releases/tag/v0.9.5
 [0.9.4]: https://github.com/tillsteinbach/VWsFriend/releases/tag/v0.9.4
 [0.9.3]: https://github.com/tillsteinbach/VWsFriend/releases/tag/v0.9.3
 [0.9.2]: https://github.com/tillsteinbach/VWsFriend/releases/tag/v0.9.2
diff --git a/vwsfriend/Dockerfile b/vwsfriend/Dockerfile
index e88cf773..8e5c5fa0 100644
--- a/vwsfriend/Dockerfile
+++ b/vwsfriend/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:experimental
 # Here is the build image
-FROM ubuntu:21.04 as builder
+FROM ubuntu:21.10 as builder
 
 ENV DEBIAN_FRONTEND="noninteractive"
 ENV TZ="Etc/UTC"
@@ -19,7 +19,7 @@ RUN --security=insecure mkdir -p /root/.cargo/registry/index && chmod 777 /root/
 RUN pip3 install --no-cache-dir vwsfriend
 
 
-FROM ubuntu:21.04 AS runner-image
+FROM ubuntu:21.10 AS runner-image
 
 ENV WECONNECT_USER=
 ENV WECONNECT_PASSWORD=