diff --git a/dockerfiles/dind/Dockerfile b/dockerfiles/dind/Dockerfile
index cb444ad..ba2ffb3 100644
--- a/dockerfiles/dind/Dockerfile
+++ b/dockerfiles/dind/Dockerfile
@@ -1,28 +1,19 @@
 ARG VERSION=docker:stable-dind
 FROM ${VERSION}
 
-RUN apk add --no-cache git tmux py2-pip apache2-utils vim build-base gettext-dev curl bash-completion bash util-linux jq openssh openssl tree \
+RUN apk add --no-cache py-pip python3-dev libffi-dev openssl-dev git tmux apache2-utils vim build-base gettext-dev curl bash-completion bash util-linux jq openssh openssl tree \
     && ln -s /usr/local/bin/docker /usr/bin/docker
 
 ENV GOPATH /root/go
 ENV PATH $PATH:$GOPATH
 
 
-# Compile and install httping
-# (used in orchestration workshop, and very useful anyway)
-RUN mkdir -p /opt && cd /opt && \
-    curl https://vanheusden.com/httping/httping-2.5.tgz | \
-    tar -zxf- && cd httping-2.5 && \
-    ./configure && make install LDFLAGS=-lintl && \
-    rm -rf httping-2.5
-
 ENV DOCKER_TLS_CERTDIR=""
 ENV DOCKER_CLI_EXPERIMENTAL=enabled
-ENV DOCKERAPP_VERSION=v0.8.0
-ENV COMPOSE_VERSION=1.23.2
-# Install Compose and Machine
-RUN pip install docker-compose==${COMPOSE_VERSION}
+ENV DOCKERAPP_VERSION=v0.9.1-beta3
+ENV COMPOSE_VERSION=1.26.0
 
+RUN pip install docker-compose==${COMPOSE_VERSION}
 
 RUN curl -fsSL --output /tmp/docker-app-linux.tar.gz https://github.com/docker/app/releases/download/${DOCKERAPP_VERSION}/docker-app-linux.tar.gz \
     && tar xf "/tmp/docker-app-linux.tar.gz" -C /tmp/ && mkdir -p /root/.docker/cli-plugins && mv /tmp/docker-app-plugin-linux /root/.docker/cli-plugins/docker-app && rm /tmp/docker-app*