diff --git a/docker/function-controller/Dockerfile b/docker/function-controller/Dockerfile
index afc58f669..0bd58bb77 100644
--- a/docker/function-controller/Dockerfile
+++ b/docker/function-controller/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/minideb:jessie
+FROM bitnami/minideb:stretch
 
 RUN install_packages ca-certificates
 
diff --git a/docker/function-image-builder/Dockerfile b/docker/function-image-builder/Dockerfile
index fae93f462..001e14f4c 100644
--- a/docker/function-image-builder/Dockerfile
+++ b/docker/function-image-builder/Dockerfile
@@ -1,6 +1,7 @@
-FROM fedora:27
+FROM debian:bullseye
 
-RUN dnf install -y skopeo nodejs
+RUN apt-get update
+RUN apt-get -y install skopeo nodejs
 
 ADD imbuilder /
 ADD entrypoint.sh /
diff --git a/docker/unzip/Dockerfile b/docker/unzip/Dockerfile
index 8f14a79af..2e5389c53 100644
--- a/docker/unzip/Dockerfile
+++ b/docker/unzip/Dockerfile
@@ -1,2 +1,2 @@
-FROM bitnami/minideb
+FROM bitnami/minideb:stretch
 RUN install_packages unzip curl ca-certificates tar gzip bzip2 xz-utils