diff --git a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh
index e2422076..77150b79 100755
--- a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh
+++ b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh
@@ -43,13 +43,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 zookeeperclusters.zookeeper.stackable.tech >/dev/null 2>&1; do
-  echo "Waiting for CRDs to be installed"
-  sleep 1
-done
-
 echo "Creating ZooKeeper cluster"
 # tag::install-zookeeper[]
 kubectl apply -f zookeeper.yaml
diff --git a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh.j2 b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh.j2
index 1c679012..4eab6743 100755
--- a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh.j2
+++ b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh.j2
@@ -43,13 +43,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 zookeeperclusters.zookeeper.stackable.tech >/dev/null 2>&1; do
-  echo "Waiting for CRDs to be installed"
-  sleep 1
-done
-
 echo "Creating ZooKeeper cluster"
 # tag::install-zookeeper[]
 kubectl apply -f zookeeper.yaml