diff --git a/Dockerfile b/Dockerfile
index 06d53d5..1e8e728 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,8 +34,19 @@ RUN apt-get update && \
     libffi-dev \
     liblzma-dev \
     mecab-ipadic-utf8 \
+    gnupg \
+    lsb-release \
     git
 
+# install Docker
+RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
+    echo \
+    "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
+    $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \
+    apt-get update && \
+    apt-get install -y docker-ce docker-ce-cli containerd.io
+
+
 # Set-up necessary Env vars for PyEnv
 ENV PYENV_ROOT="$HOME/.pyenv"
 ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
diff --git a/Makefile b/Makefile
index 8647eaa..c18a71d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,5 +3,12 @@ build:	## Builds current image
 	docker build -t dockerhub-service-integrationlibrary .
 
 .PHONY: shell
-shell:	## Builds current image
-	docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock dockerhub-service-integrationlibrary /bin/sh
\ No newline at end of file
+shell:	## Start a shell in the built image
+	docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock dockerhub-service-integrationlibrary /bin/bash
+
+.PHONY: tests
+tests:	## Tests the current build
+	docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock dockerhub-service-integrationlibrary python --version
+	docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock dockerhub-service-integrationlibrary ooil --version
+	docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock dockerhub-service-integrationlibrary docker --version
+	docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock dockerhub-service-integrationlibrary docker-compose --version
\ No newline at end of file