diff --git a/docs/modules/opensearch/examples/getting_started/getting_started.sh b/docs/modules/opensearch/examples/getting_started/getting_started.sh
index b006bfc..2ae7eab 100755
--- a/docs/modules/opensearch/examples/getting_started/getting_started.sh
+++ b/docs/modules/opensearch/examples/getting_started/getting_started.sh
@@ -48,9 +48,6 @@ exit 1
 ;;
 esac
 
-# TODO: Remove once https://github.com/stackabletech/issues/issues/828 has been implemented (see that issue for details).
-until kubectl get crd opensearchclusters.opensearch.stackable.tech >/dev/null 2>&1; do echo "Waiting for CRDs to be installed" && sleep 1; done
-
 echo "Creating OpenSearch security plugin configuration"
 # tag::apply-security-config[]
 kubectl apply -f initial-opensearch-security-config.yaml
diff --git a/docs/modules/opensearch/examples/getting_started/getting_started.sh.j2 b/docs/modules/opensearch/examples/getting_started/getting_started.sh.j2
index 0457ca5..c56c3c1 100644
--- a/docs/modules/opensearch/examples/getting_started/getting_started.sh.j2
+++ b/docs/modules/opensearch/examples/getting_started/getting_started.sh.j2
@@ -48,9 +48,6 @@ exit 1
 ;;
 esac
 
-# TODO: Remove once https://github.com/stackabletech/issues/issues/828 has been implemented (see that issue for details).
-until kubectl get crd opensearchclusters.opensearch.stackable.tech >/dev/null 2>&1; do echo "Waiting for CRDs to be installed" && sleep 1; done
-
 echo "Creating OpenSearch security plugin configuration"
 # tag::apply-security-config[]
 kubectl apply -f initial-opensearch-security-config.yaml