diff --git a/geant/gap_ansible/roles/edge_port/tasks/deploy.yaml b/geant/gap_ansible/roles/edge_port/tasks/deploy.yaml
index df45f81806e2cbbdd0b641cefcd9e45bf57e7f0c..f6e3ee638440f299fcaefbfd7fa9c747bb6fc1e5 100644
--- a/geant/gap_ansible/roles/edge_port/tasks/deploy.yaml
+++ b/geant/gap_ansible/roles/edge_port/tasks/deploy.yaml
@@ -1,3 +1,4 @@
+---
 - name: Perform "{{ verb }}" Edge port on  "{{ inventory_hostname }}" [CHECK ONLY][NOKIA]
   when: >-
       dry_run | ansible.builtin.bool
@@ -7,10 +8,21 @@
     content: "{{ lookup('ansible.builtin.template', '{{ router.vendor }}/edge_port_{{ verb }}.j2') }}"
     commit: true
     validate: true
+    config_mode: private
   diff: true
   register: output
   check_mode: true
 
+
+- name: Fail if there is any diff
+  ansible.builtin.fail:
+    msg: Base config drift detected!!!
+  when: >
+    output.changed | ansible.builtin.bool
+    and
+    is_verification_workflow | ansible.builtin.bool
+
+
 - name: Perform "{{ verb }}" Edge port on  "{{ inventory_hostname }}" [FOR REAL][NOKIA]
   when: >-
       not (dry_run | ansible.builtin.bool)
@@ -19,7 +31,8 @@
     default_operation: merge
     content: "{{ lookup('ansible.builtin.template', '{{ router.vendor }}/edge_port_{{ verb }}.j2') }}"
     commit: true
-    validate: true
+    commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   register: output
   check_mode: false