diff --git a/Makefile b/Makefile
index 01104ccf5..92521534e 100644
--- a/Makefile
+++ b/Makefile
@@ -450,16 +450,20 @@ delete-all-in-one:
 delete-ai-platform-operator:
 ifeq ($(USE_RHOAI), true) ## Delete RHOAI Operator
 	-make delete-rhoai-operator
+	-kubectl delete -f contrib/configuration/accelerator-profile.yaml -n redhat-ods-applications
 else ## Delete Open Data Hub Operator
 	-make delete-opendatahub-operator
+	-kubectl delete -f contrib/configuration/accelerator-profile.yaml -n opendatahub
 endif
 
 .PHONY: install-ai-platform-operator
 install-ai-platform-operator:
 ifeq ($(USE_RHOAI), true) ## Delete RHOAI Operator
 	-make install-rhoai-operator
+	-kubectl apply -f contrib/configuration/accelerator-profile.yaml -n redhat-ods-applications
 else ## Delete Open Data Hub Operator
 	-make install-opendatahub-operator
+	-kubectl apply -f contrib/configuration/accelerator-profile.yaml -n opendatahub
 endif
 
 .PHONY: delete-rhoai-operator
@@ -569,6 +573,7 @@ endif
 .PHONY: delete-nvidia-operator
 delete-nvidia-operator: ## Delete nvidia operator
 	@echo -e "\n==> Deleting ClusterPolicy CR \n"
+	kubectl delete --ignore-not-found=true NVIDIADriver gpu-driver
 	kubectl delete ClusterPolicy --all -n nvidia-gpu-operator
 	@while [[ -n $$(kubectl get ClusterPolicy -n nvidia-gpu-operator) ]]; do echo "."; sleep 10; done
 	@echo -e "\n==> Deleting nvidia Operator \n"
diff --git a/contrib/configuration/accelerator-profile.yaml b/contrib/configuration/accelerator-profile.yaml
new file mode 100644
index 000000000..37f64ea04
--- /dev/null
+++ b/contrib/configuration/accelerator-profile.yaml
@@ -0,0 +1,9 @@
+apiVersion: dashboard.opendatahub.io/v1
+kind: AcceleratorProfile
+metadata:
+  name: gpu-accelerator-profile
+spec: {
+  displayName: nvidia-gpu,
+  enabled: true,
+  identifier: nvidia.com/gpu
+}