diff --git a/Dockerfile b/Dockerfile
index f394adf..e2be295 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,30 +1,24 @@
-ARG COMPOSE_VERSION="1.29.2"
-
-# docker compose
-FROM ghcr.io/linuxserver/docker-compose:amd64-version-${COMPOSE_VERSION} as compose
-
-# runtime stage
-FROM ghcr.io/linuxserver/baseimage-cloud9:latest
+FROM forge.citizen4.eu/miklo/baseimage-cloud9:latest
 
 # set version label
 ARG BUILD_DATE
-ARG VERSION
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thelamer"
+ARG VERSION=cloud9:docker
+LABEL build_version="forge.citizen4.eu version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="miklo"
 
-# Docker compose
-COPY --from=compose /usr/local/bin/docker-compose /usr/local/bin/docker-compose
 
 RUN \
  echo "**** install docker deps ****" && \
- curl -s \
-	https://download.docker.com/linux/debian/gpg | \
-	apt-key add - && \
- echo 'deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable' > \
-	/etc/apt/sources.list.d/docker-ce.list && \
+ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \
+ chmod a+r /etc/apt/keyrings/docker.gpg && \
+ echo \
+   "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+   "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
+   sudo tee /etc/apt/sources.list.d/docker.list > /dev/null  && \
  apt-get update && \
  apt-get install -y --no-install-recommends \
-	docker-ce && \
+   docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin && \
+ usermod -aG docker abc && \
  echo "**** Cleanup and user perms ****" && \
  apt-get autoclean && \
  rm -rf \