diff --git a/backend/openshift.configmap.prod.yml b/backend/openshift.configmap.prod.yml
index a40c863bea..73a7d1b1b8 100644
--- a/backend/openshift.configmap.prod.yml
+++ b/backend/openshift.configmap.prod.yml
@@ -21,7 +21,10 @@ objects:
         app: ${NAME}-${ZONE}
       name: ${NAME}-${ZONE}-${COMPONENT}-config
     data:
-      application.yml: |    
+      application.yml: |
+        features:
+          staff:
+            match: false
         info:
           app:
             component: ${COMPONENT}
diff --git a/backend/openshift.configmap.test.yml b/backend/openshift.configmap.test.yml
index d31b88ca14..5ffec8c212 100644
--- a/backend/openshift.configmap.test.yml
+++ b/backend/openshift.configmap.test.yml
@@ -12,7 +12,7 @@ parameters:
     value: backend
   - name: ZONE
     description: Deployment zone, e.g. pr-### or prod
-    required: true  
+    required: true
 objects:
   - kind: ConfigMap
     apiVersion: v1
diff --git a/backend/src/main/java/ca/bc/gov/app/configuration/flags/FeatureFlagsConfiguration.java b/backend/src/main/java/ca/bc/gov/app/configuration/flags/FeatureFlagsConfiguration.java
index 2f6af04d25..55e9ac2960 100644
--- a/backend/src/main/java/ca/bc/gov/app/configuration/flags/FeatureFlagsConfiguration.java
+++ b/backend/src/main/java/ca/bc/gov/app/configuration/flags/FeatureFlagsConfiguration.java
@@ -22,23 +22,23 @@ public Predicate<BcRegistryAddressDto> isMultiAddressDisabled() {
   @Bean
   @ConditionalOnProperty(name = "features.bcregistry.multiaddress", matchIfMissing = true)
   public Predicate<BcRegistryAddressDto> isMultiAddressEnabled() {
-    log.warn("Multi address feature is enabled due to missing property");
+    log.warn("Multi address feature is enabled");
     return addressDto -> true;
   }
 
+
   @Bean
-  @ConditionalOnProperty(name = "features.staff.match", havingValue = "true")
-  public Predicate<ClientSubmissionDto> isMatcherEnabled() {
-    log.warn("Staff match feature is enabled due to property set as true");
+  @ConditionalOnProperty(prefix = "features", name = "staff.match", matchIfMissing = true)
+  public Predicate<ClientSubmissionDto> isMatcherDisabled() {
+    log.warn("Staff match feature is enabled");
     return dto -> true;
   }
 
   @Bean
-  @ConditionalOnProperty(name = "features.staff.match", matchIfMissing = true)
-  public Predicate<ClientSubmissionDto> isMatcherDisabled() {
-    log.warn("Staff match feature is disabled due to missing property");
+  @ConditionalOnProperty(prefix = "features", name = "staff.match", havingValue = "false")
+  public Predicate<ClientSubmissionDto> isMatcherDisabledByValue() {
+    log.warn("Staff match feature is disabled due to property set as false");
     return dto -> false;
   }
 
-
 }