diff --git a/src/app/app.page/app.definitions.ts b/src/app/app.page/app.definitions.ts
index 2f9d5f9..a1f7fee 100644
--- a/src/app/app.page/app.definitions.ts
+++ b/src/app/app.page/app.definitions.ts
@@ -199,6 +199,9 @@ export class AppSettings {
                 public hlsListSize: number,
                 public hlsTime: number,
                 public hlsPlayListType: string,
+                public hlsflags:string,
+                public hlsHttpEndpoint:string,
+                public addDateTimeToHlsFileName:boolean,
                 public deleteHLSFilesOnEnded: boolean,
                 public facebookClientId: string,
                 public facebookClientSecret: string,
diff --git a/src/app/app.page/app.page.component.html b/src/app/app.page/app.page.component.html
index e44f097..4ee85e7 100644
--- a/src/app/app.page/app.page.component.html
+++ b/src/app/app.page/app.page.component.html
@@ -1383,17 +1383,69 @@ <h4 class="card-title text-left" i18n="@@newLiveStreamCardTitle">
                                                                 <div class="checkbox">
 
                                                                     <input [(ngModel)]="appSettings.deleteHLSFilesOnEnded"
+                                                                    (ngModelChange)="onDeleteHLSFilesOnEndedChange()"
+
                                                                         id="deleteHLSFilesOnEnded" name="deleteHLSFilesOnEnded"
                                                                         type="checkbox">
 
                                                                     <label for="deleteHLSFilesOnEnded"
                                                                         i18n="@@deleteHLSFilesOnEnded"> 
-                                                                        Delete HLS files after the stream is finished
+                                                                        Delete HLS Segment Files After The Stream Is Finished
+                                                                        <a
+                                                                                        matTooltip="When enabled, deletes HLS segment files after the stream ends; otherwise, the server retains the specified segment list size number of files.">
+                                                                                        <i
+                                                                                            class="fa fa-info-circle"></i></a>
+                                                                    </label>
+
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <div class="col-sm-12 col-md-12 text-left">
+                                                                <div class="checkbox">
+
+                                                                    <input 
+                                                                    [(ngModel)]="keepAllHlsFilesOnEnded"
+                                                                        (ngModelChange)="onKeepAllHlsFilesOnEndedChange()"
+                                                                        id="keepAllHlsFilesOnEnded" name="keepAllHlsFilesOnEnded"
+                                                                        type="checkbox">
+
+                                                                    <label for="keepAllHlsFilesOnEnded"
+                                                                        i18n="@@keepAllHlsFilesOnEnded"> 
+                                                                        Keep All HLS Files After Stream Is Finished
+                                                                        <a
+                                                                                        matTooltip="When enabled, all generated HLS files (.m3u8 and .ts) are retained on the server after the stream ends.">
+                                                                                        <i
+                                                                                            class="fa fa-info-circle"></i></a>
                                                                     </label>
 
                                                                 </div>
                                                             </div>
+                                                            
                                                         </div>
+                                                        <div class="form-group">
+                                                            <div class="col-sm-12 col-md-12 text-left">
+                                                                <label>
+                                                                    HLS HTTP Endpoint<a
+                                                                        matTooltip="If this URL is specified, the server will upload HLS files with date time added to file names to the provided HTTP endpoint using a PUT request. Server wont generate any HLS files locally thus HLS wont be watchable through ant media server."><i
+                                                                        class="fa fa-info-circle"></i></a>
+                                                                </label>
+    
+                                                                <div>
+                                                                    <textarea name="hlsHttpEndpoint" 
+                                                                              [(ngModel)]="appSettings.hlsHttpEndpoint"
+                                                                              (ngModelChange)="onHlsHttpEndpointChange()"
+                                                                              type="textarea" class="form-control"
+                                                                              placeholder="https://example.com/hls-stream"
+                                                                              rows="1">{{appSettings.hlsHttpEndpoint}}
+                                                                    </textarea>
+                                                                   
+                                                                </div>
+                                                            
+                                                            </div>
+                                                        </div>    
+                                                      
+
 
                                                 </div>
 
@@ -1576,7 +1628,7 @@ <h4 class="card-title text-left" i18n="@@newLiveStreamCardTitle">
                                                                                     Use Object Detection <a
                                                                                         matTooltip="If you want to use this feature, you should first install necessary libraries by running install_tensorflow_plugin.sh script in the installation directory. 
                                                                                         Also you should add Adaptive Streaming. 
-                                                                                        If you still have a problem, review FAQ page in docs.antmedia.io">
+                                                                                        If you still have a problem, review FAQ page in antmedia.io/docs">
                                                                                         <i
                                                                                             class="fa fa-info-circle"></i></a>
                                                                                 </label>
@@ -1963,7 +2015,7 @@ <h4 class="card-title text-left" i18n="@@newLiveStreamCardTitle">
                                                         <div *ngIf=isEnterpriseEdition class="col-xs-12 " style="margin-top:12px">
                                                             <label>Time-based One-time Password(TOTP)*</label>
 
-                                                            <div class="checkbox" style="margin-left: 1dvb;" >
+                                                            <div class="checkbox" style="margin-left: 10px;" >
                                                                 <input [(ngModel)]="appSettings.enableTimeTokenForPublish"
                                                                     id="enableTimeTokenForPublish" (ngModelChange)="onEnableTimeTokenForPublishChange()"  name="enableTimeTokenForPublish"
                                                                     type="checkbox">
@@ -2058,7 +2110,7 @@ <h4 class="card-title text-left" i18n="@@newLiveStreamCardTitle">
 
                                                         <div *ngIf="isEnterpriseEdition" class="col-xs-12 " style="margin-top:12px">
                                                             <label>JWT Tokens*</label>
-                                                            <div class="checkbox" style="margin-left: 12px;" >
+                                                            <div class="checkbox" style="margin-left: 10px;" >
                                                                 <input [(ngModel)]="appSettings.publishJwtControlEnabled"
                                                                 (ngModelChange)="onPublishJwtControlEnabledChange()"
                                                                        id="publishJwtControlEnabled" name="publishJwtControlEnabled"
@@ -2073,7 +2125,7 @@ <h4 class="card-title text-left" i18n="@@newLiveStreamCardTitle">
                                                                         class="fa fa-info-circle"></i></a>
                                                                 </label>
                                                             </div>
-                                                            <div class="checkbox" style="margin-left: 12px;" >
+                                                            <div class="checkbox" style="margin-left: 10px;" >
                                                                 <input [(ngModel)]="appSettings.playJwtControlEnabled"
                                                                        id="playJwtControlEnabled" name="playJwtControlEnabled"
                                                                        (ngModelChange)="onPlayJwtControlEnabledChange()"
diff --git a/src/app/app.page/app.page.component.ts b/src/app/app.page/app.page.component.ts
index 805afcc..6e493f1 100644
--- a/src/app/app.page/app.page.component.ts
+++ b/src/app/app.page/app.page.component.ts
@@ -190,6 +190,7 @@ export class AppPageComponent implements OnInit, OnDestroy, AfterViewInit {
     public clusterNodes: ClusterNode[];
     public user: User;
     public currentClusterNode: string;
+    public keepAllHlsFilesOnEnded = false;
 
 
     public appSettings: AppSettings; // = new AppSettings(false, true, true, 5, 2, "event", "no clientid", "no fb secret", "no youtube cid", "no youtube secre", "no pers cid", "no pers sec");
@@ -1309,6 +1310,18 @@ export class AppPageComponent implements OnInit, OnDestroy, AfterViewInit {
         this.restService.getSettings(this.appName).subscribe(data => {
             this.appSettings = <AppSettings>data;
             this.settingsJson = JSON.stringify(data, null, 2); //JSON.stringify(data);
+
+            if(!this.appSettings.deleteHLSFilesOnEnded &&
+                this.appSettings.hlsPlayListType == "event" &&
+                this.appSettings.hlsflags.includes("append_list")
+
+                ){
+                    this.keepAllHlsFilesOnEnded = true;
+
+                }
+
+
+
             if (this.appSettings.jwtControlEnabled) {
                 let jwt = require('jsonwebtoken');
                 let currentAppJWTToken = jwt.sign({ sub: "token" }, this.appSettings.jwtSecretKey);
@@ -2788,6 +2801,42 @@ export class AppPageComponent implements OnInit, OnDestroy, AfterViewInit {
 
     }
 
+    setKeepAllHlsFilesOnEnded(enabled:boolean){
+        this.keepAllHlsFilesOnEnded = enabled;
+
+        if(enabled){
+            this.appSettings.deleteHLSFilesOnEnded = false;
+            this.appSettings.hlsPlayListType = "event"
+            this.appSettings.hlsflags="+append_list"
+            this.appSettings.hlsHttpEndpoint=""
+            this.appSettings.addDateTimeToHlsFileName = false
+
+        }else{
+            this.appSettings.hlsflags="+delete_segments"
+            this.appSettings.hlsPlayListType = ""
+        }
+    }
+
+    onKeepAllHlsFilesOnEndedChange(){
+        if(this.keepAllHlsFilesOnEnded){
+            this.setKeepAllHlsFilesOnEnded(true)
+        }else{
+            this.setKeepAllHlsFilesOnEnded(false)
+        }
+    }
+
+    onDeleteHLSFilesOnEndedChange(){
+        if(this.appSettings.deleteHLSFilesOnEnded){
+            this.setKeepAllHlsFilesOnEnded(false)
+        }
+    }
+
+    onHlsHttpEndpointChange(){
+        if(this.appSettings.hlsHttpEndpoint){
+            this.appSettings.addDateTimeToHlsFileName = true
+            this.setKeepAllHlsFilesOnEnded(false)
+        }
+    }
 
     deleteSelectedStreams(): void {