diff --git a/.k8s/mongo1-deployment.yaml b/.k8s/mongo1-deployment.yaml
index b482d117..170c5946 100644
--- a/.k8s/mongo1-deployment.yaml
+++ b/.k8s/mongo1-deployment.yaml
@@ -31,7 +31,6 @@ spec:
           persistentVolumeClaim:
             claimName: mongo1-claim0
   strategy: {}
-  status: {}
 
 ---
 apiVersion: batch/v1
@@ -44,5 +43,20 @@ spec:
       containers:
         - name: mongodb-init
           image: mongo:6
-          command: ["/bin/bash", "-c", "sleep 15 && until nc -zv mongo1 27017; do echo 'Waiting for mongo1 to be ready...'; sleep 5; done; sleep 10; mongosh --host mongo1:27017 <<EOF; cfg = { '_id': 'rs0', 'members': [ { '_id': 0, 'host': 'mongo1:27017' } ] }; rs.initiate(cfg); EOF"]
+          command:
+            - "/bin/bash"
+            - "-c"
+            - |
+              #!/bin/bash
+              echo "Mongo init"
+              sleep 30
+              mongosh --host mongo1:27017 <<EOF
+                cfg = {
+                  "_id": "rs0",
+                  "members": [
+                    { "_id": 0, "host": "mongo1:27017" }
+                  ]
+                };
+                rs.initiate(cfg);
+              EOF
       restartPolicy: OnFailure
diff --git a/.k8s/mongo1-service.yaml b/.k8s/mongo1-service.yaml
index d9b56210..c2b63f1e 100644
--- a/.k8s/mongo1-service.yaml
+++ b/.k8s/mongo1-service.yaml
@@ -12,6 +12,6 @@ spec:
       port: 27017
       targetPort: 27017
   selector:
-    name: mongo1
+    app: mongo1
 status:
   loadBalancer: {}