diff --git a/docker/release/fedora26/Dockerfile b/docker/release/fedora26/Dockerfile
index 6adbcaba0d..64e93914cf 100644
--- a/docker/release/fedora26/Dockerfile
+++ b/docker/release/fedora26/Dockerfile
@@ -26,6 +26,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
 RUN dnf install -y \
         curl \
         glibc-locale-source \
+    && dnf upgrade-minimal -y --security \
     && dnf clean all
 
 # Setup the locale
diff --git a/docker/release/fedora27/Dockerfile b/docker/release/fedora27/Dockerfile
index 276d1716cb..e109b24b0d 100644
--- a/docker/release/fedora27/Dockerfile
+++ b/docker/release/fedora27/Dockerfile
@@ -26,6 +26,8 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
 RUN dnf install -y \
         curl \
         glibc-locale-source \
+        compat-openssl10 \
+    && dnf upgrade-minimal -y --security \
     && dnf clean all
 
 # Setup the locale
diff --git a/docker/tests/Templates/fedora26/Dockerfile b/docker/tests/Templates/fedora26/Dockerfile
index 197d406d51..627042cff6 100644
--- a/docker/tests/Templates/fedora26/Dockerfile
+++ b/docker/tests/Templates/fedora26/Dockerfile
@@ -10,7 +10,9 @@ RUN dnf install -y \
         curl \
         glibc-locale-source \
         compat-openssl10 \
-        git
+        git \
+    && dnf upgrade-minimal -y --security \
+    && dnf clean all
 
 # Setup the locale
 ENV LANG en_US.UTF-8
diff --git a/docker/tests/Templates/fedora27/Dockerfile b/docker/tests/Templates/fedora27/Dockerfile
index 1ee2d98c9d..5064eb99b7 100644
--- a/docker/tests/Templates/fedora27/Dockerfile
+++ b/docker/tests/Templates/fedora27/Dockerfile
@@ -9,7 +9,10 @@ ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
 RUN dnf install -y \
         curl \
         glibc-locale-source \
-        git
+        git \
+        compat-openssl10 \
+    && dnf upgrade-minimal -y --security \
+    && dnf clean all
 
 # Setup the locale
 ENV LANG en_US.UTF-8
diff --git a/docker/tests/Templates/kalilinux/Dockerfile b/docker/tests/Templates/kalilinux/Dockerfile
deleted file mode 100644
index a10bd0693d..0000000000
--- a/docker/tests/Templates/kalilinux/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM kalilinux/kali-linux-docker:latest
-
-ARG PSVERSIONSTUB=6.0.2
-ARG PACKAGELOCATIONSTUB
-ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
-ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
-
-# Install dependencies
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        apt-utils \
-        ca-certificates \
-        curl \
-        apt-transport-https \
-        locales \
-        git
-
-# Setup the locale
-ENV LANG en_US.UTF-8
-ENV LC_ALL $LANG
-RUN locale-gen $LANG && update-locale
-
-RUN curl -L -o libssl1.0.0_1.0.1t-1+deb8u7_amd64.deb http://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u7_amd64.deb
-RUN curl -L -o powershell_$PSVERSIONSTUB-1.ubuntu.16.04_amd64.deb $PACKAGELOCATIONSTUB/powershell_$PSVERSIONSTUB-1.ubuntu.16.04_amd64.deb
-RUN dpkg -i libssl1.0.0_1.0.1t-1+deb8u7_amd64.deb || :
-RUN dpkg -i powershell_$PSVERSIONSTUB-1.ubuntu.16.04_amd64.deb || :
-RUN apt-get install -y -f
-RUN git clone --recursive $GITLOCATION
-RUN pwsh -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLISTSTUB -PassThru).FailedCount"