diff --git a/backend/dataconnect/connector/certificate/mutations.gql b/backend/dataconnect/connector/certificate/mutations.gql
index 08a7b5b8..a9b1dd0a 100644
--- a/backend/dataconnect/connector/certificate/mutations.gql
+++ b/backend/dataconnect/connector/certificate/mutations.gql
@@ -29,21 +29,20 @@ mutation CreateCertificate(
 }
 
 mutation UpdateCertificate(
-  $id: UUID!
+  $staffId: UUID!
+  $certificationType: ComplianceType!
   $name: String
   $description: String
   $expiry: Timestamp
   $status: CertificateStatus
   $fileUrl: String
   $icon: String
-  $staffId: UUID
-  $certificationType: ComplianceType
   $issuer: String
   $validationStatus: ValidationStatus
   $certificateNumber: String
 ) @auth(level: USER) {
   certificate_update(
-    id: $id
+    key: { staffId: $staffId, certificationType: $certificationType }
     data: {
       name: $name
       description: $description
@@ -51,8 +50,6 @@ mutation UpdateCertificate(
       status: $status
       fileUrl: $fileUrl
       icon: $icon
-      staffId: $staffId
-      certificationType: $certificationType
       issuer: $issuer
       validationStatus: $validationStatus
       certificateNumber: $certificateNumber
@@ -60,8 +57,11 @@ mutation UpdateCertificate(
   )
 }
 
-mutation DeleteCertificate($id: UUID!) @auth(level: USER) {
-  certificate_delete(id: $id)
+mutation DeleteCertificate($staffId: UUID!, $certificationType: ComplianceType!)
+@auth(level: USER) {
+  certificate_delete(
+    key: { staffId: $staffId, certificationType: $certificationType }
+  )
 }
 
 # UPSERT STAFF CERTIFICATE
diff --git a/backend/dataconnect/connector/certificate/queries.gql b/backend/dataconnect/connector/certificate/queries.gql
index 75798d8e..3d101249 100644
--- a/backend/dataconnect/connector/certificate/queries.gql
+++ b/backend/dataconnect/connector/certificate/queries.gql
@@ -21,8 +21,11 @@ query listCertificates @auth(level: USER) {
   }
 }
 
-query getCertificateById($id: UUID!) @auth(level: USER) {
-  certificate(id: $id) {
+query getCertificateByKey($staffId: UUID!, $certificationType: ComplianceType!)
+@auth(level: USER) {
+  certificate(
+    key: { staffId: $staffId, certificationType: $certificationType }
+  ) {
     id
     name
     description
diff --git a/makefiles/common.mk b/makefiles/common.mk
index 3c2b9b86..ad0eb662 100644
--- a/makefiles/common.mk
+++ b/makefiles/common.mk
@@ -1,7 +1,11 @@
 # --- Environment & Variables ---
 
 # Flutter check
+ifeq ($(OS),Windows_NT)
+FLUTTER := flutter
+else
 FLUTTER := $(shell which flutter)
+endif
 
 # Firebase & GCP Configuration
 GCP_DEV_PROJECT_ID     := krow-workforce-dev
diff --git a/makefiles/dataconnect.mk b/makefiles/dataconnect.mk
index 7285b997..3ae3410e 100644
--- a/makefiles/dataconnect.mk
+++ b/makefiles/dataconnect.mk
@@ -268,4 +268,4 @@ dataconnect-bootstrap-validation-database: dataconnect-file-validation
 	@echo "⚠️  Generating Data Connect SDK ($(DC_SERVICE))..."
 	@firebase dataconnect:sdk:generate --project=$(FIREBASE_ALIAS)
 
-	@echo "🎉 Validation Cloud SQL + Data Connect bootstrap completed successfully!"
+	@echo "🎉 Validation Cloud SQL + Data Connect bootstrap completed successfully!"
\ No newline at end of file