diff --git a/Makefile b/Makefile
index c77fc8927..d72324a44 100644
--- a/Makefile
+++ b/Makefile
@@ -370,7 +370,7 @@ ct: $(BUILD_DIRS)
 	    $(CHART_TEST_IMAGE)                                     \
 	    /bin/sh -c "                                            \
 	      set -x; \
-	      kubectl delete crds --all; \
+	      ./hack/scripts/cleanup.sh; \
 	      ./hack/scripts/update-chart-dependencies.sh; \
 	      ct $(CT_COMMAND) --debug --validate-maintainers=false $(CT_ARGS) \
 	    "
diff --git a/hack/scripts/cleanup.sh b/hack/scripts/cleanup.sh
new file mode 100755
index 000000000..de0dfd78a
--- /dev/null
+++ b/hack/scripts/cleanup.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Copyright AppsCode Inc. and Contributors
+#
+# Licensed under the AppsCode Community License 1.0.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://github.com/appscode/licenses/raw/1.0.0/AppsCode-Community-1.0.0.md
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eou pipefail
+
+kubectl patch crds providerconfigs.aws.kubedb.com -p '{"metadata":{"finalizers":null}}' --type=merge || true
+kubectl patch crds providerconfigs.gcp.kubedb.com -p '{"metadata":{"finalizers":null}}' --type=merge || true
+kubectl patch crds providerconfigs.azure.kubedb.com -p '{"metadata":{"finalizers":null}}' --type=merge || true
+kubectl delete crds --all