diff --git a/standalone/hooks/hook-ipyvuetify.py b/standalone/hooks/hook-ipyvuetify.py
new file mode 100644
index 0000000000..d3bee8c400
--- /dev/null
+++ b/standalone/hooks/hook-ipyvuetify.py
@@ -0,0 +1,5 @@
+from PyInstaller.utils.hooks import collect_data_files, copy_metadata, collect_submodules
+
+hiddenimports = collect_submodules("ipyvuetify")
+datas = collect_data_files('ipyvuetify')
+datas += copy_metadata('ipyvuetify')
diff --git a/standalone/hooks/hook-solara.py b/standalone/hooks/hook-solara.py
new file mode 100644
index 0000000000..0a51665040
--- /dev/null
+++ b/standalone/hooks/hook-solara.py
@@ -0,0 +1,5 @@
+from PyInstaller.utils.hooks import collect_data_files, copy_metadata, collect_submodules
+
+hiddenimports = collect_submodules("solara")
+datas = collect_data_files('solara')
+datas += collect_data_files('solara-ui')
diff --git a/standalone/hooks/hook-solara_server.py b/standalone/hooks/hook-solara_server.py
new file mode 100644
index 0000000000..227108ff6a
--- /dev/null
+++ b/standalone/hooks/hook-solara_server.py
@@ -0,0 +1,5 @@
+from PyInstaller.utils.hooks import collect_data_files, copy_metadata, collect_submodules
+
+hiddenimports = collect_submodules("solara-server")
+datas = collect_data_files('solara-server')
+datas += copy_metadata('solara-server')
diff --git a/standalone/hooks/hook-solara_ui.py b/standalone/hooks/hook-solara_ui.py
new file mode 100644
index 0000000000..3747e9a718
--- /dev/null
+++ b/standalone/hooks/hook-solara_ui.py
@@ -0,0 +1,5 @@
+from PyInstaller.utils.hooks import collect_data_files, copy_metadata, collect_submodules
+
+hiddenimports = collect_submodules("solara-ui")
+datas = collect_data_files('solara-ui')
+datas += copy_metadata('solara-ui')
diff --git a/standalone/jdaviz-cli-entrypoint.py b/standalone/jdaviz-cli-entrypoint.py
index 27dde09c5c..1fdde82efb 100644
--- a/standalone/jdaviz-cli-entrypoint.py
+++ b/standalone/jdaviz-cli-entrypoint.py
@@ -1,23 +1,6 @@
-import sys
-
-def start_as_kernel():
-    # similar to https://github.com/astrofrog/voila-qt-app/blob/master/voila_demo.py
-    import sys
-
-    from ipykernel import kernelapp as app
-    app.launch_new_instance()
-    sys.argv = [app.__file__, sys.argv[3:]]
+import jdaviz.cli
 
 
 if __name__ == "__main__":
-    # When voila starts a kernel under pyinstaller, it will use sys.executable
-    # (which is this entry point again)
-    # if called like [sys.argv[0], "-m", "ipykernel_launcher", ...]
-    if len(sys.argv) >= 3 and sys.argv[1] == "-m" and sys.argv[2] == "ipykernel_launcher":
-        # it is important that we do not import jdaviz top level
-        # as that would cause it to import ipywidgets before the kernel is started
-        start_as_kernel()
-    else:
-        import jdaviz.cli
-        # should change this to _main, but now it doesn't need arguments
-        jdaviz.cli.main(layout="")
+    # should change this to _main, but now it doesn't need arguments
+    jdaviz.cli.main(layout="")