diff --git a/release/preview/ubuntu16.04/meta.json b/release/preview/ubuntu16.04/meta.json
index 0d25d735a..3d77edcc1 100644
--- a/release/preview/ubuntu16.04/meta.json
+++ b/release/preview/ubuntu16.04/meta.json
@@ -10,5 +10,6 @@
     ],
     "TestProperties": {
         "size": 395
-    }
+    },
+    "SubImage": "test-deps"
 }
diff --git a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..47525e4df
--- /dev/null
+++ b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile
@@ -0,0 +1,36 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-16.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-16.04
+ARG PS_VERSION=6.2.0
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/ubuntu16.04/test-deps/meta.json b/release/preview/ubuntu16.04/test-deps/meta.json
new file mode 100644
index 000000000..52857c13b
--- /dev/null
+++ b/release/preview/ubuntu16.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 16.04",
+    "tagTemplates": [
+        "preview-ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 399
+    }
+}
diff --git a/release/preview/ubuntu18.04/meta.json b/release/preview/ubuntu18.04/meta.json
index cb134cf10..7d305b9c0 100644
--- a/release/preview/ubuntu18.04/meta.json
+++ b/release/preview/ubuntu18.04/meta.json
@@ -10,5 +10,6 @@
     ],
     "TestProperties": {
         "size": 355
-    }
+    },
+    "SubImage": "test-deps"
 }
diff --git a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..258542433
--- /dev/null
+++ b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile
@@ -0,0 +1,36 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-18.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-18.04
+ARG PS_VERSION=6.2.0
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/ubuntu18.04/test-deps/meta.json b/release/preview/ubuntu18.04/test-deps/meta.json
new file mode 100644
index 000000000..77e767295
--- /dev/null
+++ b/release/preview/ubuntu18.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 18.04",
+    "tagTemplates": [
+        "preview-ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 358
+    }
+}
diff --git a/release/stable/debian9/test-deps/docker/Dockerfile b/release/stable/debian9/test-deps/docker/Dockerfile
index 4868f6760..c71aec48a 100644
--- a/release/stable/debian9/test-deps/docker/Dockerfile
+++ b/release/stable/debian9/test-deps/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Docker image file that describes an Debian 9image with PowerShell and test dependencies
+# Docker image file that describes an Debian 9 image with PowerShell and test dependencies
 ARG BaseImage=mcr.microsoft.com/powershell:debian-9
 
 FROM ${BaseImage}
diff --git a/release/stable/ubuntu16.04/meta.json b/release/stable/ubuntu16.04/meta.json
index 2bbfabd80..0f210994a 100644
--- a/release/stable/ubuntu16.04/meta.json
+++ b/release/stable/ubuntu16.04/meta.json
@@ -10,5 +10,6 @@
     "SkipGssNtlmSspTests": false,
     "TestProperties": {
         "size": 395
-    }
+    },
+    "SubImage": "test-deps"
 }
diff --git a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..47525e4df
--- /dev/null
+++ b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile
@@ -0,0 +1,36 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-16.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-16.04
+ARG PS_VERSION=6.2.0
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/ubuntu16.04/test-deps/meta.json b/release/stable/ubuntu16.04/test-deps/meta.json
new file mode 100644
index 000000000..8152d828e
--- /dev/null
+++ b/release/stable/ubuntu16.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 16.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 399
+    }
+}
diff --git a/release/stable/ubuntu18.04/meta.json b/release/stable/ubuntu18.04/meta.json
index 879284ee2..6824b3ab2 100644
--- a/release/stable/ubuntu18.04/meta.json
+++ b/release/stable/ubuntu18.04/meta.json
@@ -10,5 +10,6 @@
     ],
     "TestProperties": {
         "size": 355
-    }
+    },
+    "SubImage": "test-deps"
 }
diff --git a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..258542433
--- /dev/null
+++ b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile
@@ -0,0 +1,36 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-18.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-18.04
+ARG PS_VERSION=6.2.0
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/ubuntu18.04/test-deps/meta.json b/release/stable/ubuntu18.04/test-deps/meta.json
new file mode 100644
index 000000000..83453bb64
--- /dev/null
+++ b/release/stable/ubuntu18.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 18.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 358
+    }
+}