diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
index 0b334b546ab..14433be8b3e 100644
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@@ -1,7 +1,7 @@
-FROM debian:unstable
+FROM debian:stable
 
 LABEL usage="docker run -i -t -v /var/run/docker.sock:/host/var/run/docker.sock -v /dev:/host/dev -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro --name NAME IMAGE"
-LABEL maintainer="opensource@sysdig.com"
+LABEL maintainer="cncf-falco-dev@lists.cncf.io"
 
 ARG FALCO_VERSION=
 RUN test -n FALCO_VERSION
diff --git a/docker/minimal/Dockerfile b/docker/minimal/Dockerfile
index 6439cb54641..bc16b01cc26 100644
--- a/docker/minimal/Dockerfile
+++ b/docker/minimal/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:18.04 as ubuntu
 
-LABEL maintainer="opensource@sysdig.com"
+LABEL maintainer="cncf-falco-dev@lists.cncf.io"
 
 ARG FALCO_VERSION=0.19.0
 
diff --git a/docker/rhel/Dockerfile b/docker/rhel/Dockerfile
index 06c154c7544..4a987fd5865 100644
--- a/docker/rhel/Dockerfile
+++ b/docker/rhel/Dockerfile
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhel7
 
-LABEL maintainer="opensource@sysdig.com"
+LABEL maintainer="cncf-falco-dev@lists.cncf.io"
 
 ### Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
 LABEL name="falco" \
diff --git a/docker/slim-dev/Dockerfile b/docker/slim-dev/Dockerfile
index e518ba722cc..e36a58c673a 100644
--- a/docker/slim-dev/Dockerfile
+++ b/docker/slim-dev/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 
-LABEL maintainer="opensource@sysdig.com"
+LABEL maintainer="cncf-falco-dev@lists.cncf.io"
 
 ENV FALCO_REPOSITORY dev
 
diff --git a/docker/slim-stable/Dockerfile b/docker/slim-stable/Dockerfile
index f5a09247ad1..9083c8c0638 100644
--- a/docker/slim-stable/Dockerfile
+++ b/docker/slim-stable/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 
-LABEL maintainer="opensource@sysdig.com"
+LABEL maintainer="cncf-falco-dev@lists.cncf.io"
 
 ENV FALCO_REPOSITORY stable
 
diff --git a/docker/stable/Dockerfile b/docker/stable/Dockerfile
index 23cec2ac2e4..0dfde2d05d6 100644
--- a/docker/stable/Dockerfile
+++ b/docker/stable/Dockerfile
@@ -1,6 +1,6 @@
-FROM debian:unstable
+FROM debian:stable
 
-LABEL maintainer="opensource@sysdig.com"
+LABEL maintainer="cncf-falco-dev@lists.cncf.io"
 
 ENV FALCO_REPOSITORY stable