diff --git a/.github/workflows/chart-validation.yml b/.github/workflows/chart-validation.yml
deleted file mode 100644
index 48ac993..0000000
--- a/.github/workflows/chart-validation.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# name: Chart Validation
-# on:
-#   push:
-#     branches:
-#       - main
-#   pull_request:
-#     branches:
-#       - main
-
-# jobs:
-#   validate:
-#     runs-on: ubuntu-latest
-
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v2
-
-#       - name: Install Helm
-#         run: |
-#           curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
-#       # Validate that the Helm charts adhere to the proper structure and contain the necessary files.
-#       # This includes checking for the presence of Chart.yaml, values.yaml, and other required files.
-#       - name: Validate Helm Charts
-#         run: |
-#           helm repo add stable https://charts.helm.sh/stable
-#           helm repo update
-#           helm lint charts/memgraph/
-#       # The Helm templates are rendered using the helm template command, 
-#       # and the output is stored in a file named rendered-templates.yaml. 
-#       # This step ensures that there are no syntax or rendering errors in the templates.
-#       - name: Render Helm Templates
-#         run: |
-#           helm template charts/memgraph/ > rendered-templates.yaml
-#       # The kubeval tool is installed to validate the rendered templates against the Kubernetes API schemas.
-#       - name: Install kubeval
-#         run: |
-#           curl -LO "https://github.com/instrumenta/kubeval/releases/latest/download/kubeval-linux-amd64.tar.gz"
-#           tar xf kubeval-linux-amd64.tar.gz
-#           sudo mv kubeval /usr/local/bin/
-#       # The rendered templates are validated using kubeval, which checks if the Kubernetes manifests in the Helm charts adhere to the Kubernetes API schemas.
-#       - name: Validate Rendered Templates
-#         run: |
-#           kubeval rendered-templates.yaml
diff --git a/charts/memgraph/templates/tests/test-connection.yaml b/charts/memgraph/templates/tests/test-connection.yaml
index df3cc55..76f7d42 100644
--- a/charts/memgraph/templates/tests/test-connection.yaml
+++ b/charts/memgraph/templates/tests/test-connection.yaml
@@ -1,15 +1,20 @@
-apiVersion: v1
-kind: Pod
+apiVersion: batch/v1
+kind: Job
 metadata:
-  name: "{{ include "memgraph.fullname" . }}-test-connection"
-  labels:
+  name: "{{ .Release.Name }}-memgraph-test"
+  labels: 
     {{- include "memgraph.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test
 spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "memgraph.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never
+  template:
+    spec:
+      containers:
+      - name: memgraph-test
+        image: memgraph/memgraph:2.16.0  
+        command: ["/bin/sh", "-c"]
+        args:
+          - |
+            echo "RETURN 0;" | mgconsole --host {{ include "memgraph.fullname" . }} --port 7687
+      restartPolicy: Never
+  backoffLimit: 4