diff --git a/Dockerfile b/Dockerfile
index 324286586..da62096b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ RUN pip install pipenv && \
     pipenv lock -r --dev-only > requirements-dev.txt
 
 # Stage 2: Build website
-FROM docker.io/node as website-builder
+FROM docker.io/node:16 as website-builder
 
 COPY ./website /static/
 
@@ -19,7 +19,7 @@ ENV NODE_ENV=production
 RUN cd /static && npm i && npm run build-docs-only
 
 # Stage 3: Build webui
-FROM docker.io/node as web-builder
+FROM docker.io/node:16 as web-builder
 
 COPY ./web /static/
 
diff --git a/authentik/crypto/api.py b/authentik/crypto/api.py
index 3b284baee..2c9a0baaa 100644
--- a/authentik/crypto/api.py
+++ b/authentik/crypto/api.py
@@ -141,7 +141,7 @@ class CertificateKeyPairFilter(FilterSet):
 class CertificateKeyPairViewSet(UsedByMixin, ModelViewSet):
     """CertificateKeyPair Viewset"""
 
-    queryset = CertificateKeyPair.objects.all()
+    queryset = CertificateKeyPair.objects.exclude(managed__isnull=False)
     serializer_class = CertificateKeyPairSerializer
     filterset_class = CertificateKeyPairFilter
 
diff --git a/proxy.Dockerfile b/proxy.Dockerfile
index ac0a52404..73181bdd7 100644
--- a/proxy.Dockerfile
+++ b/proxy.Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build website
-FROM docker.io/node as web-builder
+FROM docker.io/node:16 as web-builder
 
 COPY ./web /static/