diff --git a/deployment/crs-architecture.sh b/deployment/crs-architecture.sh
index fcc6510f..afd51584 100755
--- a/deployment/crs-architecture.sh
+++ b/deployment/crs-architecture.sh
@@ -261,13 +261,18 @@ down-k8s() {
 		esac
 	fi
 	echo -e "${BLU}Deleting Kubernetes resource${NC}"
+	set -x
 	kubectl delete -k k8s/base/tailscale-connections/
 	helm uninstall --wait --namespace "$BUTTERCUP_NAMESPACE" buttercup
+	# Remove finalizers from clickhouse installation as stated in https://signoz.io/docs/operate/kubernetes/#uninstall-signoz
+	# Without this, the namespace would not be deleted
+	kubectl -n "$BUTTERCUP_NAMESPACE" patch clickhouseinstallations.clickhouse.altinity.com/buttercup-clickhouse -p '{"metadata":{"finalizers":[]}}' --type=merge
 	kubectl delete -k k8s/base/tailscale-coredns/
 	kubectl delete -k k8s/base/tailscale-dns/
 	kubectl delete -k k8s/base/tailscale-operator/
 	kubectl delete secret ghcr --namespace "$BUTTERCUP_NAMESPACE"
 	kubectl delete namespace "$BUTTERCUP_NAMESPACE"
+	set +x
 	set -e
 }
 
diff --git a/scripts/setup-azure.sh b/scripts/setup-azure.sh
index 298bfcdb..37fa1281 100755
--- a/scripts/setup-azure.sh
+++ b/scripts/setup-azure.sh
@@ -80,8 +80,7 @@ setup_config() {
     configure_langfuse
     
     # Configure SigNoz deployment (optional)
-    # TODO: reenable signoz configuration once it is fixed
-    # configure_otel
+    configure_otel
 }
 
 # Function to validate configuration
diff --git a/scripts/setup-local.sh b/scripts/setup-local.sh
index b471e5fd..48636074 100755
--- a/scripts/setup-local.sh
+++ b/scripts/setup-local.sh
@@ -28,8 +28,7 @@ setup_config() {
     configure_langfuse
     
     # Configure SigNoz deployment (optional)
-    # TODO: reenable signoz configuration once it is fixed
-    # configure_otel
+    configure_otel
 }
 
 # Function to verify setup