diff --git a/metabase.yaml b/metabase.yaml
index 8a7b30a..01b22c6 100644
--- a/metabase.yaml
+++ b/metabase.yaml
@@ -40,7 +40,10 @@ spec:
           - name: MB_DB_USER
             value: postgres
           - name: MB_DB_PASS
-            value: "wGWHn9bhjJbM27V"
+            valueFrom:
+                secretKeyRef:
+                  name: postgresql-credentials
+                  key: password
           - name: MB_DB_HOST
             value: home.toozhao.com
         ports:
@@ -52,10 +55,10 @@ spec:
             memory: 256Mi
           limits:
             cpu: 800m
-            memory: 700Mi
+            memory: 1Gi
 ---
 
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: metabase-ingress
@@ -67,14 +70,17 @@ metadata:
     nginx.ingress.kubernetes.io/auth-signin: "https://id.home.toozhao.com/oauth2/start?rd=https%3A%2F%2F$host$request_uri"
 spec:
   tls:
-  - hosts:
-    - metabase.home.toozhao.com
-    secretName: metabase-tls
+    - hosts:
+        - metabase.home.toozhao.com
+      secretName: metabase-tls
   rules:
-  - host: metabase.home.toozhao.com
-    http:
-      paths:
-      - backend:
-          serviceName: metabase
-          servicePort: 3000
-        path: /
+    - host: metabase.home.toozhao.com
+      http:
+        paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: metabase
+              port:
+                number: 3000
diff --git a/nas.yaml b/nas.yaml
index e10b058..f42224e 100644
--- a/nas.yaml
+++ b/nas.yaml
@@ -34,7 +34,7 @@ spec:
         - containerPort: 80
 ---
 
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: nas-ingress
@@ -54,6 +54,9 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: nas-proxy
-          servicePort: 80
+          service:
+            name: nas-proxy
+            port:
+              number: 80
         path: /
+        pathType: Prefix
diff --git a/plex-proxy.yaml b/plex-proxy.yaml
deleted file mode 100644
index 01fd144..0000000
--- a/plex-proxy.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: plex-proxy
-spec:
-  ports:
-  - port: 80
-    targetPort: 80
-  selector:
-    app: plex-proxy
----
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: plex-proxy
-spec:
-  selector:
-    matchLabels:
-      app: plex-proxy
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: plex-proxy
-    spec:
-      containers:
-      - name: plex-proxy
-        image: alpine/socat
-        args:
-          - "tcp-listen:80,fork,reuseaddr"
-          - "tcp-connect:192.168.1.4:32400"
-        ports:
-        - containerPort: 80
----
-
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: plex-ingress
-  annotations:
-    kubernetes.io/ingress.class: "nginx"
-    kubernetes.io/tls-acme: "true"
-    cert-manager.io/cluster-issuer: "letsencrypt-prod"
-    # nginx.ingress.kubernetes.io/auth-url: "https://id.home.toozhao.com/oauth2/auth"
-    # nginx.ingress.kubernetes.io/auth-signin: "https://id.home.toozhao.com/oauth2/start?rd=https%3A%2F%2F$host$request_uri"
-spec:
-  tls:
-  - hosts:
-    - plex.home.toozhao.com
-    secretName: plex-tls
-  rules:
-  - host: plex.home.toozhao.com
-    http:
-      paths:
-      - backend:
-          serviceName: plex-proxy
-          servicePort: 80
-        path: /