diff --git a/docs/modules/hdfs/examples/getting_started/getting_started.sh b/docs/modules/hdfs/examples/getting_started/getting_started.sh
index 0f7b8689..10b9f1c8 100755
--- a/docs/modules/hdfs/examples/getting_started/getting_started.sh
+++ b/docs/modules/hdfs/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 hdfsclusters.hdfs.stackable.tech >/dev/null 2>&1; do echo "Waiting for CRDs to be installed" && sleep 1; done
-
 echo "Creating Zookeeper cluster"
 # tag::install-zk[]
 kubectl apply -f zk.yaml
diff --git a/docs/modules/hdfs/examples/getting_started/getting_started.sh.j2 b/docs/modules/hdfs/examples/getting_started/getting_started.sh.j2
index 73abfd5c..77d7ecc2 100755
--- a/docs/modules/hdfs/examples/getting_started/getting_started.sh.j2
+++ b/docs/modules/hdfs/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 hdfsclusters.hdfs.stackable.tech >/dev/null 2>&1; do echo "Waiting for CRDs to be installed" && sleep 1; done
-
 echo "Creating Zookeeper cluster"
 # tag::install-zk[]
 kubectl apply -f zk.yaml