diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index a999bf35..842081ad 100755
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -3,7 +3,7 @@ ARG BASE_IMAGE
 FROM $BASE_IMAGE as build
 
 RUN apt-get update && apt-get install -y \
-    libmosquitto-dev libssl-dev libstdc++6 libc6 libgcc1 \
+    knxd-dev knxd- libmosquitto-dev libssl-dev libstdc++6 libc6 libgcc1 \
     curl \
     autoconf automake g++ make git \
     && rm -rf /var/lib/apt/lists/*
@@ -20,7 +20,7 @@ ENV EBUSD_VERSION $EBUSD_VERSION
 ENV GIT_REVISION $GIT_REVISION
 
 ADD . /build
-RUN RUNTEST=full GIT_REVISION=$GIT_REVISION ./make_debian.sh
+RUN RUNTEST=full GIT_REVISION=$GIT_REVISION ./make_debian.sh --with-knxd
 
 
 
@@ -28,7 +28,7 @@ RUN RUNTEST=full GIT_REVISION=$GIT_REVISION ./make_debian.sh
 FROM $BASE_IMAGE-slim as image
 
 RUN apt-get update && apt-get install -y \
-    libmosquitto1 libssl1.1 ca-certificates libstdc++6 libc6 libgcc1 \
+    knxd-dev knxd- libmosquitto1 libssl1.1 ca-certificates libstdc++6 libc6 libgcc1 \
     && rm -rf /var/lib/apt/lists/*
 
 LABEL maintainer="ebusd@ebusd.eu"
diff --git a/contrib/docker/Dockerfile.template b/contrib/docker/Dockerfile.template
index ae486783..5f0a717f 100644
--- a/contrib/docker/Dockerfile.template
+++ b/contrib/docker/Dockerfile.template
@@ -3,7 +3,7 @@ ARG BASE_IMAGE
 FROM $BASE_IMAGE as build
 
 RUN apt-get update && apt-get install -y \
-    libmosquitto-dev libssl-dev libstdc++6 libc6 libgcc1 \
+    %EBUSD_EXTRAPKGS%libmosquitto-dev libssl-dev libstdc++6 libc6 libgcc1 \
     curl \
     autoconf automake g++ make git \
     && rm -rf /var/lib/apt/lists/*
@@ -28,7 +28,7 @@ RUN %EBUSD_MAKE%
 FROM $BASE_IMAGE-slim as image
 
 RUN apt-get update && apt-get install -y \
-    libmosquitto1 libssl1.1 ca-certificates libstdc++6 libc6 libgcc1 \
+    %EBUSD_EXTRAPKGS%libmosquitto1 libssl1.1 ca-certificates libstdc++6 libc6 libgcc1 \
     && rm -rf /var/lib/apt/lists/*
 
 LABEL maintainer="ebusd@ebusd.eu"
diff --git a/contrib/docker/update.sh b/contrib/docker/update.sh
index 4c237db5..529b47e6 100755
--- a/contrib/docker/update.sh
+++ b/contrib/docker/update.sh
@@ -5,6 +5,7 @@ function replaceTemplate () {
   sed \
     -e "s#%EBUSD_MAKE%#${make}#g" \
     -e "s#%EBUSD_VERSION_VARIANT%#${version_variant}#g" \
+    -e "s#%EBUSD_EXTRAPKGS%#${extrapkgs}#g" \
     -e "s#%EBUSD_UPLOAD_LINES%#${upload_lines}#g" \
     -e "s#%EBUSD_COPYDEB%#${copydeb}#g" \
     -e "s#%EBUSD_DEBSRC%#${debsrc}#g" \
@@ -15,8 +16,8 @@ function replaceTemplate () {
 
 # devel update
 version_variant='-devel'
-make='RUNTEST=full GIT_REVISION=\$GIT_REVISION ./make_debian.sh'
-upload_lines=''
+make='RUNTEST=full GIT_REVISION=\$GIT_REVISION ./make_debian.sh --with-knxd'
+extrapkgs='knxd-dev knxd- '
 copydeb='COPY --from=build /build/ebusd-*_mqtt1.deb ebusd.deb'
 debsrc='ebusd.deb \&\& rm -f ebusd.deb'
 copyentry='COPY --from=build /build/contrib/docker/docker-entrypoint.sh /'
@@ -26,6 +27,7 @@ replaceTemplate
 # release update
 version_variant=''
 make='GIT_REVISION=\$GIT_REVISION ./make_debian.sh'
+extrapkgs=''
 copydeb="ADD https://github.com/john30/ebusd/releases/download/\${EBUSD_VERSION}/ebusd-\${EBUSD_VERSION}_\${TARGETARCH}\${TARGETVARIANT}-\${EBUSD_IMAGE}_mqtt1.deb ebusd.deb"
 copyentry='COPY contrib/docker/docker-entrypoint.sh /'
 namesuffix='.release'