diff --git a/Makefile b/Makefile
index 119be6d..1d60756 100644
--- a/Makefile
+++ b/Makefile
@@ -26,13 +26,16 @@ dist-bin/localstack build: $(VENV_ACTIVATE) main.py
 		$(PYINSTALLER_ARGS) -n localstack \
 		--hidden-import cookiecutter.main \
 		--hidden-import cookiecutter.extensions \
-		--hidden-import localstack.dev.run.configurators \
-		--hidden-import localstack.pro.core.plugins \
-		--hidden-import localstack.pro.core.cli.localstack \
-		--hidden-import localstack.pro.core.extensions.plugins \
+		--hidden-import localstack_cli.cli.core_plugin \
+		--hidden-import localstack_cli.pro.core.cli.localstack \
+		--hidden-import localstack_cli.runtime \
+		--hidden-import localstack_cli.runtime.hooks \
+		--hidden-import localstack_cli.runtime.exceptions \
+		--hidden-import localstack_cli.pro.core.plugins \
+		--hidden-import localstack_cli.pro.core.bootstrap.extensions.bootstrap \
+		--hidden-import localstack_cli.utils.analytics.metadata \
 		--collect-all=rich \
-		--copy-metadata localstack_ext \
-		--collect-data localstack.pro.core \
+		--copy-metadata localstack \
 		--additional-hooks-dir hooks
 
 dist-dir/localstack: PYINSTALLER_ARGS=--distpath=dist-dir
@@ -47,4 +50,3 @@ clean-venv:
 	rm -rf $(VENV_DIR)
 
 .PHONY: all build clean clean-venv
-
diff --git a/hooks/hook-localstack.py b/hooks/hook-localstack.py
new file mode 100644
index 0000000..aa25af3
--- /dev/null
+++ b/hooks/hook-localstack.py
@@ -0,0 +1,4 @@
+from PyInstaller.utils.hooks import copy_metadata
+
+# make sure to add the entrypoints data for localstack (for plux plugin discovery)
+datas = copy_metadata('localstack')
diff --git a/hooks/hook-localstack_core.py b/hooks/hook-localstack_core.py
deleted file mode 100644
index 5387559..0000000
--- a/hooks/hook-localstack_core.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from PyInstaller.utils.hooks import copy_metadata
-
-# make sure to add the entrypoints data for localstack-core
-datas = copy_metadata('localstack_core')
diff --git a/main.py b/main.py
index a5de157..0632618 100644
--- a/main.py
+++ b/main.py
@@ -3,7 +3,7 @@
 freeze_support()
 
 os.environ["SKIP_PATCH_MOTO_ACCOUNT_ID"] = "1"
-from localstack.cli import main
+from localstack_cli.cli import main
 
 if __name__ == '__main__':
 	main.main()
diff --git a/requirements.txt b/requirements.txt
index d3a39df..01c29e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 pyinstaller
-localstack==4.13.1
+localstack==4.13.2.dev36
 cookiecutter