diff --git a/kustomize/bases/grafana/provision/datasources.yaml b/kustomize/bases/grafana/provision/datasources.yaml
index eb5a677..d353e41 100644
--- a/kustomize/bases/grafana/provision/datasources.yaml
+++ b/kustomize/bases/grafana/provision/datasources.yaml
@@ -3,5 +3,5 @@ datasources:
   - name: prometheus
     type: prometheus
     access: proxy
-    url: http://prometheus-operated.monitoring.svc.cluster.local:9090
+    url: http://prometheus-operated.monitoring.svc:9090
     isDefault: true
diff --git a/kustomize/bases/home-assistant/home-assistant-deployment.yaml b/kustomize/bases/home-assistant/home-assistant-deployment.yaml
index 435753d..acbabe9 100644
--- a/kustomize/bases/home-assistant/home-assistant-deployment.yaml
+++ b/kustomize/bases/home-assistant/home-assistant-deployment.yaml
@@ -39,7 +39,7 @@ spec:
               mountPath: /server-config
               readOnly: true
       containers:
-        - image: homeassistant/home-assistant:2023.5.4
+        - image: homeassistant/home-assistant
           name: home-assistant
           securityContext:
             privileged: true
diff --git a/kustomize/bases/nextcloud/nextcloud-cronjob.yaml b/kustomize/bases/nextcloud/nextcloud-cronjob.yaml
index 62d0417..164e9fb 100644
--- a/kustomize/bases/nextcloud/nextcloud-cronjob.yaml
+++ b/kustomize/bases/nextcloud/nextcloud-cronjob.yaml
@@ -26,7 +26,7 @@ spec:
           restartPolicy: Never
           serviceAccountName: server-cron
           containers:
-          - name: kubectl
+          - name: run-nextcloud-cron
             image: bitnami/kubectl
             imagePullPolicy: IfNotPresent
             command: ["/bin/bash"]
diff --git a/kustomize/bases/nextcloud/nextcloud-deployment.yaml b/kustomize/bases/nextcloud/nextcloud-deployment.yaml
index f7b3822..ca957eb 100644
--- a/kustomize/bases/nextcloud/nextcloud-deployment.yaml
+++ b/kustomize/bases/nextcloud/nextcloud-deployment.yaml
@@ -54,14 +54,14 @@ spec:
             - name: TRUSTED_PROXIES
               value: 10.0.0.0/8
             - name: REDIS_HOST
-              value: nextcloud-redis.$(NAMESPACE).svc.cluster.local
+              value: nextcloud-redis.$(NAMESPACE).svc
             - name: REDIS_HOST_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: redis-credentials
                   key: password
             - name: POSTGRES_HOST
-              value: nextcloud-postgres.$(NAMESPACE).svc.cluster.local
+              value: nextcloud-postgres.$(NAMESPACE).svc
             - name: POSTGRES_DB
               valueFrom:
                 secretKeyRef:
diff --git a/kustomize/env/prod/kustomization.yaml b/kustomize/env/prod/kustomization.yaml
index ed8d8fa..3c34441 100644
--- a/kustomize/env/prod/kustomization.yaml
+++ b/kustomize/env/prod/kustomization.yaml
@@ -30,7 +30,9 @@ images:
   - name: drone/drone-runner-kube
     newTag: 1.0.0-rc.3
   - name: nextcloud
-    newTag: 25.0.3
+    newTag: 26.0.2
+  - name: homeassistant/home-assistant
+    newTag: 2023.5.4
   - name: postgres
     newTag: 9.6.23
   - name: redis