diff --git a/Dockerfile b/Dockerfile
index fc7c131..1991ef4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,9 @@ RUN \
  debuild -b -uc -us && \
  cp -ax ../xrdp_*.deb /buildout/xrdp.deb
 
+# docker compose
+FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose
+
 # runtime stage
 FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
 
@@ -59,6 +62,7 @@ LABEL maintainer="thelamer"
 
 # copy over libs and installers from build stage
 COPY --from=buildstage /buildout/ /
+COPY --from=compose /usr/local/bin/docker-compose /usr/local/bin/docker-compose
 
 RUN \
  echo "**** install deps ****" && \
@@ -77,6 +81,7 @@ RUN \
 	libxfixes3 \
 	libxml2 \
 	libxrandr2 \
+	openssh-client \
 	pulseaudio \
 	software-properties-common \
 	sudo \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 2934843..1b4b3d9 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -48,6 +48,9 @@ RUN \
  debuild -b -uc -us && \
  cp -ax ../xrdp_*.deb /buildout/xrdp.deb
 
+# docker compose
+FROM ghcr.io/linuxserver/docker-compose:arm64v8-latest as compose
+
 # runtime stage
 FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
 
@@ -59,6 +62,7 @@ LABEL maintainer="thelamer"
 
 # copy over libs and installers from build stage
 COPY --from=buildstage /buildout/ /
+COPY --from=compose /usr/local/bin/docker-compose /usr/local/bin/docker-compose
 
 RUN \
  echo "**** install deps ****" && \
@@ -77,6 +81,7 @@ RUN \
 	libxfixes3 \
 	libxml2 \
 	libxrandr2 \
+	openssh-client \
 	pulseaudio \
 	software-properties-common \
 	sudo \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 64190a6..d6d2c12 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -48,6 +48,9 @@ RUN \
  debuild -b -uc -us && \
  cp -ax ../xrdp_*.deb /buildout/xrdp.deb
 
+# docker compose
+FROM ghcr.io/linuxserver/docker-compose:arm32v7-latest as compose
+
 # runtime stage
 FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
 
@@ -59,6 +62,7 @@ LABEL maintainer="thelamer"
 
 # copy over libs and installers from build stage
 COPY --from=buildstage /buildout/ /
+COPY --from=compose /usr/local/bin/docker-compose /usr/local/bin/docker-compose
 
 RUN \
  echo "**** install deps ****" && \
@@ -77,6 +81,7 @@ RUN \
 	libxfixes3 \
 	libxml2 \
 	libxrandr2 \
+	openssh-client \
 	pulseaudio \
 	software-properties-common \
 	sudo \
diff --git a/root/etc/cont-init.d/13-keygen b/root/etc/cont-init.d/13-keygen
new file mode 100644
index 0000000..7d1bc73
--- /dev/null
+++ b/root/etc/cont-init.d/13-keygen
@@ -0,0 +1,12 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -f "/keylock" ]; then
+    cd /etc/xrdp
+    xrdp-keygen xrdp
+    rm -f /etc/xrdp/*.pem
+    openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \
+    -keyout /etc/xrdp/key.pem \
+    -out /etc/xrdp/cert.pem \
+    -subj "/C=US/ST=CA/L=Carlsbad/O=Linuxserver.io/OU=LSIO Server/CN=*"
+    touch /keylock
+fi