diff --git a/docs/modules/opa/examples/getting_started/getting_started.sh b/docs/modules/opa/examples/getting_started/getting_started.sh
index 5d69ddd5..a86fc08c 100755
--- a/docs/modules/opa/examples/getting_started/getting_started.sh
+++ b/docs/modules/opa/examples/getting_started/getting_started.sh
@@ -39,9 +39,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 opaclusters.opa.stackable.tech >/dev/null 2>&1; do echo "Waiting for CRDs to be installed" && sleep 1; done
-
 echo "Creating OPA cluster"
 # tag::apply-opa-cluster[]
 kubectl apply -f opa.yaml
diff --git a/docs/modules/opa/examples/getting_started/getting_started.sh.j2 b/docs/modules/opa/examples/getting_started/getting_started.sh.j2
index 9d066051..76e02e02 100755
--- a/docs/modules/opa/examples/getting_started/getting_started.sh.j2
+++ b/docs/modules/opa/examples/getting_started/getting_started.sh.j2
@@ -39,9 +39,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 opaclusters.opa.stackable.tech >/dev/null 2>&1; do echo "Waiting for CRDs to be installed" && sleep 1; done
-
 echo "Creating OPA cluster"
 # tag::apply-opa-cluster[]
 kubectl apply -f opa.yaml