diff --git a/n2n/Dockerfile b/n2n/Dockerfile
index a1ced81..7c49b3b 100644
--- a/n2n/Dockerfile
+++ b/n2n/Dockerfile
@@ -2,13 +2,13 @@
 # Dockerfile for n2n
 #
 
-FROM debian:buster
+FROM debian:bookworm
 MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
     && apt update \
     && apt install -y gnupg iptables lsb-release net-tools wget \
-    && wget http://apt.ntop.org/buster/all/apt-ntop.deb \
+    && wget http://apt.ntop.org/bookworm/all/apt-ntop.deb \
     && dpkg -i apt-ntop.deb \
     && apt update \
     && apt install -y n2n \
diff --git a/n2n/arm/Dockerfile b/n2n/arm/Dockerfile
index 60bc63b..68508cd 100644
--- a/n2n/arm/Dockerfile
+++ b/n2n/arm/Dockerfile
@@ -2,7 +2,7 @@
 # Dockerfile for n2n-arm
 #
 
-FROM arm32v7/debian:buster
+FROM debian:buster
 MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
diff --git a/n2n/docker-compose.yml b/n2n/docker-compose.yml
index 6e9e38a..d7bc94c 100644
--- a/n2n/docker-compose.yml
+++ b/n2n/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.5'
+version: "3.8"
 
 services: