diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 00000000..bb1370c7
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# LICENSE owner
+LICENSE @chkp-liavt
diff --git a/aws/templates/gwlb-asg/gwlb.yaml b/aws/templates/gwlb-asg/gwlb.yaml
index e75f5fc3..4b411149 100644
--- a/aws/templates/gwlb-asg/gwlb.yaml
+++ b/aws/templates/gwlb-asg/gwlb.yaml
@@ -779,6 +779,9 @@ Resources:
   Listener:
     Type: AWS::ElasticLoadBalancingV2::Listener
     Properties:
+      ListenerAttributes:
+        - Key: tcp.idle_timeout.seconds
+          Value: 3600
       DefaultActions:
         - Type: forward
           TargetGroupArn: !Ref TargetGroup
diff --git a/aws/templates/gwlb-asg/qs-gwlb.yaml b/aws/templates/gwlb-asg/qs-gwlb.yaml
index a97bfef0..bfcf3c20 100644
--- a/aws/templates/gwlb-asg/qs-gwlb.yaml
+++ b/aws/templates/gwlb-asg/qs-gwlb.yaml
@@ -947,6 +947,9 @@ Resources:
   Listener:
     Type: AWS::ElasticLoadBalancingV2::Listener
     Properties:
+      ListenerAttributes:
+        - Key: tcp.idle_timeout.seconds
+          Value: 3600
       DefaultActions:
         - Type: forward
           TargetGroupArn: !Ref TargetGroup