diff --git a/images/linux/scripts/installers/1804/containers.sh b/images/linux/scripts/installers/1804/containers.sh
new file mode 100644
index 000000000..0ccf746ab
--- /dev/null
+++ b/images/linux/scripts/installers/1804/containers.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+################################################################################
+##  File:  containers.sh
+##  Desc:  Installs container tools: podman, buildah and skopeo onto the image
+################################################################################
+
+source $HELPER_SCRIPTS/apt.sh
+source $HELPER_SCRIPTS/document.sh
+
+source /etc/os-release
+sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list"
+wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key
+apt-key add - < Release.key
+apt-get update -qq
+apt-get -qq -y install podman buildah skopeo
+mkdir -p /etc/containers
+echo -e "[registries.search]\nregistries = ['docker.io', 'quay.io']" | tee /etc/containers/registries.conf
+
+## Add version information to the metadata file
+echo "Documenting container tools version"
+PODMAN_VERSION='podman --version'
+BUILDAH_VERSION='buildah --version'
+SKOPEO_VERSION='skopeo --version'
+DocumentInstalledItem "Podman ($PODMAN_VERSION)\nBuildah ($BUILDAH_VERSION)\nSkopeo ($SKOPEO_VERSION)"
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 89871ce05..0fffd8c13 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -149,6 +149,7 @@
                 "{{template_dir}}/scripts/installers/clang.sh",
                 "{{template_dir}}/scripts/installers/swift.sh",
                 "{{template_dir}}/scripts/installers/cmake.sh",
+                "{{template_dir}}/scripts/installers/1804/containers.sh",
                 "{{template_dir}}/scripts/installers/docker-compose.sh",
                 "{{template_dir}}/scripts/installers/docker-moby.sh",
                 "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh",