diff --git a/app/controllers/oidc_auth_controller.rb b/app/controllers/oidc_auth_controller.rb
index 3a27ced..0942229 100644
--- a/app/controllers/oidc_auth_controller.rb
+++ b/app/controllers/oidc_auth_controller.rb
@@ -175,7 +175,7 @@ class OidcAuthController < ApplicationController
   # JWT claim extraction and validation
   def extract_claims_from_id_token(id_token)
     # Decode JWT without verification first to get claims
-    decoded_jwt = JWT.decode(id_token, nil, false).first
+    decoded_jwt = JSON::JWT.decode(id_token, :skip_verification)
 
     {
       sub: decoded_jwt['sub'],
diff --git a/app/models/waf_policy.rb b/app/models/waf_policy.rb
index c061ed6..eee270b 100644
--- a/app/models/waf_policy.rb
+++ b/app/models/waf_policy.rb
@@ -153,8 +153,8 @@ validate :targets_must_be_array
     return nil unless matches_network_range?(network_range)
 
     rule = Rule.create!(
-      rule_type: 'network',
-      action: policy_action,
+      waf_rule_type: 'network',
+      waf_action: policy_action,
       network_range: network_range,
       waf_policy: self,
       user: user,