diff --git a/centos/centos_7/Dockerfile b/centos/centos_7/Dockerfile
index 93ab295..8041d81 100644
--- a/centos/centos_7/Dockerfile
+++ b/centos/centos_7/Dockerfile
@@ -37,6 +37,8 @@ RUN yum install -y epel-release \
         SDL-devel \
         xterm \
         mesa-libGL-devel \
+        openssh-server \
+        openssh-clients \
     && pip3 install GitPython jinja2 \
     && useradd -ms /bin/bash yocto \
     && printf "yocto:yocto" | chpasswd \
diff --git a/centos/centos_7/docker-compose.test.yml b/centos/centos_7/docker-compose.test.yml
new file mode 100644
index 0000000..a1edf48
--- /dev/null
+++ b/centos/centos_7/docker-compose.test.yml
@@ -0,0 +1,6 @@
+sut:
+    build: .
+    command: /bin/bash -c "
+        git clone git://git.yoctoproject.org/poky
+        && source poky/oe-init-build-env
+        && bitbake --dry-run core-image-minimal" 
diff --git a/centos/centos_8/Dockerfile b/centos/centos_8/Dockerfile
index 22dc27e..4df6791 100644
--- a/centos/centos_8/Dockerfile
+++ b/centos/centos_8/Dockerfile
@@ -47,6 +47,8 @@ RUN dnf install -y 'dnf-command(config-manager)' \
         rpcgen \
         mesa-libGL-devel \
         glibc-langpack-en \
+        openssh-server \
+        openssh-clients \
     && useradd -ms /bin/bash yocto \
     && printf "yocto:yocto" | chpasswd \
     && printf "yocto ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \
diff --git a/centos/centos_8/docker-compose.test.yml b/centos/centos_8/docker-compose.test.yml
new file mode 100644
index 0000000..a1edf48
--- /dev/null
+++ b/centos/centos_8/docker-compose.test.yml
@@ -0,0 +1,6 @@
+sut:
+    build: .
+    command: /bin/bash -c "
+        git clone git://git.yoctoproject.org/poky
+        && source poky/oe-init-build-env
+        && bitbake --dry-run core-image-minimal" 
diff --git a/debian/debian_10/Dockerfile b/debian/debian_10/Dockerfile
index d603c65..7dd62dd 100644
--- a/debian/debian_10/Dockerfile
+++ b/debian/debian_10/Dockerfile
@@ -31,6 +31,7 @@ RUN apt-get clean \
         xterm \
         python3-subunit \
         mesa-common-dev \
+        openssh-server \
     && useradd -ms /bin/bash yocto \
     && printf "yocto:yocto" | chpasswd \
     && adduser yocto sudo \
diff --git a/debian/debian_10/docker-compose.test.yml b/debian/debian_10/docker-compose.test.yml
new file mode 100644
index 0000000..a1edf48
--- /dev/null
+++ b/debian/debian_10/docker-compose.test.yml
@@ -0,0 +1,6 @@
+sut:
+    build: .
+    command: /bin/bash -c "
+        git clone git://git.yoctoproject.org/poky
+        && source poky/oe-init-build-env
+        && bitbake --dry-run core-image-minimal" 
diff --git a/debian/debian_9/Dockerfile b/debian/debian_9/Dockerfile
index 1cfcd93..77197d5 100644
--- a/debian/debian_9/Dockerfile
+++ b/debian/debian_9/Dockerfile
@@ -31,6 +31,7 @@ RUN apt-get clean \
         xterm \
         python3-subunit \
         mesa-common-dev \
+        openssh-server \
     && useradd -ms /bin/bash yocto \
     && printf "yocto:yocto" | chpasswd \
     && adduser yocto sudo \
diff --git a/debian/debian_9/docker-compose.test.yml b/debian/debian_9/docker-compose.test.yml
new file mode 100644
index 0000000..a1edf48
--- /dev/null
+++ b/debian/debian_9/docker-compose.test.yml
@@ -0,0 +1,6 @@
+sut:
+    build: .
+    command: /bin/bash -c "
+        git clone git://git.yoctoproject.org/poky
+        && source poky/oe-init-build-env
+        && bitbake --dry-run core-image-minimal" 
diff --git a/fedora/fedora_31/Dockerfile b/fedora/fedora_31/Dockerfile
index 9fd3631..e23fe42 100644
--- a/fedora/fedora_31/Dockerfile
+++ b/fedora/fedora_31/Dockerfile
@@ -43,7 +43,9 @@ RUN dnf -y update \
         SDL-devel \
         xterm \
         rpcgen \
-        mesa-libGL-devel\
+        mesa-libGL-devel \
+        openssh-server \
+        openssh-clients \
     && useradd -ms /bin/bash yocto \
     && printf "yocto:yocto" | chpasswd \
     && printf "yocto ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \
diff --git a/fedora/fedora_31/docker-compose.test.yml b/fedora/fedora_31/docker-compose.test.yml
new file mode 100644
index 0000000..a1edf48
--- /dev/null
+++ b/fedora/fedora_31/docker-compose.test.yml
@@ -0,0 +1,6 @@
+sut:
+    build: .
+    command: /bin/bash -c "
+        git clone git://git.yoctoproject.org/poky
+        && source poky/oe-init-build-env
+        && bitbake --dry-run core-image-minimal" 
diff --git a/fedora/fedora_32/Dockerfile b/fedora/fedora_32/Dockerfile
index 511eb25..399b22c 100644
--- a/fedora/fedora_32/Dockerfile
+++ b/fedora/fedora_32/Dockerfile
@@ -43,7 +43,9 @@ RUN dnf -y update \
         SDL-devel \
         xterm \
         rpcgen \
-        mesa-libGL-devel\
+        mesa-libGL-devel \
+        openssh-server \
+        openssh-clients \
     && useradd -ms /bin/bash yocto \
     && printf "yocto:yocto" | chpasswd \
     && printf "yocto ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \
diff --git a/fedora/fedora_32/docker-compose.test.yml b/fedora/fedora_32/docker-compose.test.yml
new file mode 100644
index 0000000..a1edf48
--- /dev/null
+++ b/fedora/fedora_32/docker-compose.test.yml
@@ -0,0 +1,6 @@
+sut:
+    build: .
+    command: /bin/bash -c "
+        git clone git://git.yoctoproject.org/poky
+        && source poky/oe-init-build-env
+        && bitbake --dry-run core-image-minimal" 
diff --git a/test.sh b/test.sh
deleted file mode 100644
index 3d50f83..0000000
--- a/test.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-git clone git://git.yoctoproject.org/poky && \
-	source poky/oe-init-build-env && \
-	bitbake --dry-run core-image
diff --git a/ubuntu/ubuntu_16/Dockerfile b/ubuntu/ubuntu_16/Dockerfile
index 53614f9..b385ce4 100644
--- a/ubuntu/ubuntu_16/Dockerfile
+++ b/ubuntu/ubuntu_16/Dockerfile
@@ -34,6 +34,7 @@ RUN apt-get -qq update \
        xterm \
        python3-subunit \
        mesa-common-dev \
+       openssh-server \
     && useradd -ms /bin/bash yocto \
     && printf "yocto:yocto" | chpasswd \
     && adduser yocto sudo \
diff --git a/ubuntu/ubuntu_16/docker-compose.test.yml b/ubuntu/ubuntu_16/docker-compose.test.yml
new file mode 100644
index 0000000..a1edf48
--- /dev/null
+++ b/ubuntu/ubuntu_16/docker-compose.test.yml
@@ -0,0 +1,6 @@
+sut:
+    build: .
+    command: /bin/bash -c "
+        git clone git://git.yoctoproject.org/poky
+        && source poky/oe-init-build-env
+        && bitbake --dry-run core-image-minimal" 
diff --git a/ubuntu/ubuntu_18/Dockerfile b/ubuntu/ubuntu_18/Dockerfile
index a4b07ae..719fa64 100644
--- a/ubuntu/ubuntu_18/Dockerfile
+++ b/ubuntu/ubuntu_18/Dockerfile
@@ -34,6 +34,7 @@ RUN apt-get -qq update \
        xterm \
        python3-subunit \
        mesa-common-dev \
+       openssh-server \
     && useradd -ms /bin/bash yocto \
     && printf "yocto:yocto" | chpasswd \
     && adduser yocto sudo \
diff --git a/ubuntu/ubuntu_18/docker-compose.test.yml b/ubuntu/ubuntu_18/docker-compose.test.yml
new file mode 100644
index 0000000..a1edf48
--- /dev/null
+++ b/ubuntu/ubuntu_18/docker-compose.test.yml
@@ -0,0 +1,6 @@
+sut:
+    build: .
+    command: /bin/bash -c "
+        git clone git://git.yoctoproject.org/poky
+        && source poky/oe-init-build-env
+        && bitbake --dry-run core-image-minimal" 
diff --git a/ubuntu/ubuntu_20/Dockerfile b/ubuntu/ubuntu_20/Dockerfile
index 21d1989..30df0ca 100644
--- a/ubuntu/ubuntu_20/Dockerfile
+++ b/ubuntu/ubuntu_20/Dockerfile
@@ -34,6 +34,7 @@ RUN apt-get -qq update \
        xterm \
        python3-subunit \
        mesa-common-dev \
+       openssh-server \
     && useradd -ms /bin/bash yocto \
     && printf "yocto:yocto" | chpasswd \
     && adduser yocto sudo \
diff --git a/ubuntu/ubuntu_20/docker-compose.test.yml b/ubuntu/ubuntu_20/docker-compose.test.yml
new file mode 100644
index 0000000..a1edf48
--- /dev/null
+++ b/ubuntu/ubuntu_20/docker-compose.test.yml
@@ -0,0 +1,6 @@
+sut:
+    build: .
+    command: /bin/bash -c "
+        git clone git://git.yoctoproject.org/poky
+        && source poky/oe-init-build-env
+        && bitbake --dry-run core-image-minimal"