diff --git a/CHANGELOG.md b/CHANGELOG.md
index 103c6a40a..aeb4c1fad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Nothing should go in this section, please add to the latest unreleased version
   (and update the corresponding date), or add a new version.
 
-## [1.7.18] - 2023-06-08
+## [1.7.18] - 2023-06-12
+
+### Changed
+- Update CRD test script.
+  [cyberark/secretless-broker#1499](https://github.com/cyberark/secretless-broker/pull/1499)
 
 ## [1.7.17] - 2023-04-17
 
diff --git a/k8s-ci/k8s_crds/test b/k8s-ci/k8s_crds/test
index 1231b8c53..a0f18f37e 100755
--- a/k8s-ci/k8s_crds/test
+++ b/k8s-ci/k8s_crds/test
@@ -64,7 +64,7 @@ function wait_for_CRD() {
     if [[ "$attempt_count" -ge "$max_attempts" ]]; then
       echo ""
       echo "CRD is not ready after $attempt_count readiness checks at 2 second intervals." >&2
-      exit 1
+      return 1
     fi
     echo -n "."
     sleep 2
@@ -84,7 +84,7 @@ function wait_for_pod() {
     if [[ "$attempt_count" -ge "$max_attempts" ]]; then
       echo ""
       echo "pod is not ready after $attempt_count readiness checks at 2 second intervals." >&2
-      exit 1
+      return 1
     fi
     echo -n "."
     sleep 2
@@ -97,7 +97,7 @@ function wait_for_pod() {
     if [[ "$attempt_count" -ge "$max_attempts" ]]; then
       echo ""
       echo "pod endpoint is not ready after $attempt_count readiness checks at 2 second intervals." >&2
-      exit 1
+      return 1
     fi
     echo -n "."
     sleep 2
@@ -160,12 +160,12 @@ function main() {
 
   # deploy secretless and echo-server
   deploy_secretless
-  wait_for_CRD
-  wait_for_pod
+  wait_for_CRD || exit_err "K8s-CRD test: Failed in wait_for_CRD()"
+  wait_for_pod || exit_err "K8s-CRD test: Failed in wait_for_pod()"
 
   # run test cases
   run_test_case "create configuration object" user1 password1
   run_test_case "update configuration object" ohnoeswechangedit supersecretpassword
 }
 
-main || exit_err "K8s-CRD test: Failed inside main()"
+main