diff --git a/.github/workflows/build-release/e107_make.php b/.github/workflows/build-release/e107_make.php
index 7033a7e15..30f1c3866 100644
--- a/.github/workflows/build-release/e107_make.php
+++ b/.github/workflows/build-release/e107_make.php
@@ -252,7 +252,7 @@ class e107Build
 				$this->createCoreImage(); // Create Image
 			}
 
-			$this->copyCoreImage($this->exportDir . "e107_admin/core_image.php");
+			$this->copyCoreImage($this->exportDir . "e107_system/core_image.phar");
 
 			if (isset($rel['readme']))
 			{
diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php
index b01ee96ae..b510359d6 100644
--- a/e107_admin/lancheck.php
+++ b/e107_admin/lancheck.php
@@ -354,22 +354,6 @@ class lancheck
 
 		$acceptedLans = explode(",",e_LANLIST);
 	
-		
-		if(!isset($_SESSION['lancheck-core-image']))
-		{
-			$core = array();	
-
-			$coredir = array('admin' => 'e107_admin', 'files' => 'e107_files', 'images' => 'e107_images', 'themes' => 'e107_themes', 'plugins' => 'e107_plugins', 'handlers' => 'e107_handlers', 'languages' => 'e107_languages', 'downloads' => 'e107_downloads', 'docs' => 'e107_docs');
-
-			$core_image = array();
-
-			require_once(e_ADMIN."core_image.php");
-			
-			unset($core_image['e107_images'],$core_image['e107_files'],$core_image['e107_admin']);
-			
-			$_SESSION['lancheck-core-image'] = $core_image;	
-		}
-
 
 		if(!empty($_POST['ziplang']))
 		{
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 574433876..2440fa62a 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -1615,7 +1615,7 @@ class e107
 	 */
     public static function getFileInspector($type = 'core')
     {
-        $fileInspectorPath = realpath(e_ADMIN . "core_image.php");
+        $fileInspectorPath = realpath(e_SYSTEM . "core_image.phar");
         /** @var e_file_inspector $fileInspector */
         $fileInspector = self::getObject('e_file_inspector_json_phar', $fileInspectorPath);
 
diff --git a/e107_handlers/e_file_inspector.php b/e107_handlers/e_file_inspector.php
index 3475419a3..71223f94f 100644
--- a/e107_handlers/e_file_inspector.php
+++ b/e107_handlers/e_file_inspector.php
@@ -68,7 +68,7 @@ abstract class e_file_inspector implements e_file_inspector_interface
             return realpath($path) ? realpath($path) : $path;
         }, [
                 $appRoot . "e107_config.php",
-                $appRoot . e107::getFolder('admin') . "core_image.php",
+                $appRoot . e107::getFolder('system') . "core_image.phar",
             ]
         );
         $this->existingInsecureFiles = array_filter($this->insecureFiles, function ($path)