diff --git a/apps/epg/models.py b/apps/epg/models.py
index dce4e21b..27e85e29 100644
--- a/apps/epg/models.py
+++ b/apps/epg/models.py
@@ -59,8 +59,46 @@ class EPGSource(models.Model):
         return self.name
 
     def get_cache_file(self):
-        # Decide on file extension
-        file_ext = ".gz" if self.url.lower().endswith('.gz') else ".xml"
+        import mimetypes
+
+        # Use a temporary extension for initial download
+        # The actual extension will be determined after content inspection
+        file_ext = ".tmp"
+
+        # If file_path is already set and contains an extension, use that
+        # This handles cases where we've already detected the proper type
+        if self.file_path and os.path.exists(self.file_path):
+            _, existing_ext = os.path.splitext(self.file_path)
+            if existing_ext:
+                file_ext = existing_ext
+            else:
+                # Try to detect the MIME type and map to extension
+                mime_type, _ = mimetypes.guess_type(self.file_path)
+                if mime_type:
+                    if mime_type == 'application/gzip' or mime_type == 'application/x-gzip':
+                        file_ext = '.gz'
+                    elif mime_type == 'application/zip':
+                        file_ext = '.zip'
+                    elif mime_type == 'application/xml' or mime_type == 'text/xml':
+                        file_ext = '.xml'
+                # For files without mime type detection, try peeking at content
+                else:
+                    try:
+                        with open(self.file_path, 'rb') as f:
+                            header = f.read(4)
+                            # Check for gzip magic number (1f 8b)
+                            if header[:2] == b'\x1f\x8b':
+                                file_ext = '.gz'
+                            # Check for zip magic number (PK..)
+                            elif header[:2] == b'PK':
+                                file_ext = '.zip'
+                            # Check for XML
+                            elif header[:5] == b'<?xml' or header[:5] == b'<tv>':
+                                file_ext = '.xml'
+                    except Exception as e:
+                        # If we can't read the file, just keep the default extension
+                        pass
+
         filename = f"{self.id}{file_ext}"
 
         # Build full path in MEDIA_ROOT/cached_epg
diff --git a/apps/epg/tasks.py b/apps/epg/tasks.py
index 3e27c6af..03cb5e41 100644
--- a/apps/epg/tasks.py
+++ b/apps/epg/tasks.py
@@ -372,6 +372,43 @@ def fetch_xmltv(source):
             # Send completion notification
             send_epg_update(source.id, "downloading", 100)
 
+            # Determine the appropriate file extension based on content type or URL
+            content_type = response.headers.get('Content-Type', '').lower()
+            original_url = source.url.lower()
+
+            # Default extension is xml
+            file_extension = '.xml'
+
+            # Check content type first
+            if 'application/x-gzip' in content_type or 'application/gzip' in content_type:
+                file_extension = '.gz'
+            elif 'application/zip' in content_type:
+                file_extension = '.zip'
+            # If content type didn't help, try the URL
+            elif original_url.endswith('.gz'):
+                file_extension = '.gz'
+            elif original_url.endswith('.zip'):
+                file_extension = '.zip'
+
+            # Update the cache file path with the correct extension
+            base_cache_path = os.path.splitext(cache_file)[0]
+            new_cache_file = f"{base_cache_path}{file_extension}"
+
+            # Actually rename the file on disk
+            logger.debug(f"Renaming file from {cache_file} to {new_cache_file}")
+            try:
+                os.rename(cache_file, new_cache_file)
+                cache_file = new_cache_file  # Update the variable to point to the renamed file
+            except OSError as e:
+                logger.error(f"Failed to rename temporary file: {e}")
+                # If rename fails, keep using the original file
+                logger.warning(f"Continuing with temporary file: {cache_file}")
+                new_cache_file = cache_file  # Fall back to the tmp file
+
+            # Update the source's file_path to reflect the correct extension
+            source.file_path = new_cache_file
+            source.save(update_fields=['file_path', 'status'])
+
             # Update status to parsing
             source.status = 'parsing'
             source.save(update_fields=['status'])
@@ -490,6 +527,9 @@ def parse_channels_only(source):
     # Send initial parsing notification
     send_epg_update(source.id, "parsing_channels", 0)
 
+    process = None
+    should_log_memory = False
+
     try:
         # Check if the file exists
         if not os.path.exists(file_path):
@@ -860,6 +900,7 @@ def parse_programs_for_tvg_id(epg_id):
     source_file = None
     program_parser = None
     programs_to_create = []
+    programs_processed = 0
     try:
         # Add memory tracking only in trace mode or higher
         try:
@@ -962,7 +1003,6 @@ def parse_programs_for_tvg_id(epg_id):
 
         programs_to_create = []
         batch_size = 1000  # Process in batches to limit memory usage
-        programs_processed = 0
 
         try:
             # Open the file based on its type