diff --git a/clearml/backend_interface/task/repo/scriptinfo.py b/clearml/backend_interface/task/repo/scriptinfo.py
index 9d51b2b9..d603b788 100644
--- a/clearml/backend_interface/task/repo/scriptinfo.py
+++ b/clearml/backend_interface/task/repo/scriptinfo.py
@@ -760,7 +760,7 @@ class ScriptInfo(object):
     def _get_script_info(
             cls, filepaths, check_uncommitted=True, create_requirements=True, log=None,
             uncommitted_from_remote=False, detect_jupyter_notebook=True,
-            add_missing_installed_packages=False, detailed_req_report=None):
+            add_missing_installed_packages=False, detailed_req_report=None, force_single_script=False):
         jupyter_filepath = cls._get_jupyter_notebook_filename() if detect_jupyter_notebook else None
         if jupyter_filepath:
             scripts_path = [Path(os.path.normpath(jupyter_filepath)).absolute()]
@@ -786,7 +786,11 @@ class ScriptInfo(object):
 
         script_dir = scripts_dir[0]
         script_path = scripts_path[0]
-        plugin = next((p for p in cls.plugins if p.exists(script_dir)), None)
+
+        if force_single_script:
+            plugin = None
+        else:
+            plugin = next((p for p in cls.plugins if p.exists(script_dir)), None)
 
         repo_info = DetectionResult()
         messages = []
@@ -880,7 +884,7 @@ class ScriptInfo(object):
     @classmethod
     def get(cls, filepaths=None, check_uncommitted=True, create_requirements=True, log=None,
             uncommitted_from_remote=False, detect_jupyter_notebook=True, add_missing_installed_packages=False,
-            detailed_req_report=None):
+            detailed_req_report=None, force_single_script=False):
         try:
             if not filepaths:
                 filepaths = [sys.argv[0], ]
@@ -892,6 +896,7 @@ class ScriptInfo(object):
                 detect_jupyter_notebook=detect_jupyter_notebook,
                 add_missing_installed_packages=add_missing_installed_packages,
                 detailed_req_report=detailed_req_report,
+                force_single_script=force_single_script,
             )
         except SystemExit:
             pass
diff --git a/clearml/backend_interface/task/task.py b/clearml/backend_interface/task/task.py
index 488967fe..e0a47358 100644
--- a/clearml/backend_interface/task/task.py
+++ b/clearml/backend_interface/task/task.py
@@ -75,6 +75,7 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
     _report_subprocess_enabled = deferred_config('development.report_use_subprocess', sys.platform == 'linux')
     _force_use_pip_freeze = deferred_config(multi=[('development.detect_with_pip_freeze', False),
                                                    ('development.detect_with_conda_freeze', False)])
+    _force_store_standalone_script = False
     _offline_filename = 'task.json'
 
     class TaskTypes(Enum):
@@ -246,8 +247,11 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
             result, script_requirements = ScriptInfo.get(
                 filepaths=[self._calling_filename, sys.argv[0], ]
                 if ScriptInfo.is_running_from_module() else [sys.argv[0], self._calling_filename, ],
-                log=self.log, create_requirements=False,
-                check_uncommitted=self._store_diff, uncommitted_from_remote=self._store_remote_diff
+                log=self.log,
+                create_requirements=False,
+                check_uncommitted=self._store_diff,
+                uncommitted_from_remote=self._store_remote_diff,
+                force_single_script=self._force_store_standalone_script,
             )
             for msg in result.warning_messages:
                 self.get_logger().report_text(msg)
@@ -1856,6 +1860,19 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
         """
         cls._force_use_pip_freeze = requirements_file if requirements_file else bool(force)
 
+    @classmethod
+    def force_store_standalone_script(cls, force=True):
+        # type: (bool) -> None
+        """
+        Force using storing the main python file as a single standalone script, instead of linking with the
+        local git repository/commit ID.
+
+        Notice: Must be called before `Task.init` !
+
+        :param force: Set force using `pip freeze` flag on/off
+        """
+        cls._force_store_standalone_script = bool(force)
+
     def _get_default_report_storage_uri(self):
         # type: () -> str
         if self._offline_mode: