diff --git a/packages/playwright-ct-qwik/src/lib/add-qwik-loader.ts b/packages/playwright-ct-qwik/src/lib/add-qwik-loader.ts
deleted file mode 100644
index 6b33442..0000000
--- a/packages/playwright-ct-qwik/src/lib/add-qwik-loader.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { QWIK_LOADER } from '@builder.io/qwik/loader';
-
-export function addQwikLoader() {
-  const scriptEl = document.createElement('script');
-  const inlineScript = document.createTextNode(QWIK_LOADER);
-  scriptEl.appendChild(inlineScript);
-  document.body.appendChild(scriptEl);
-}
diff --git a/packages/playwright-ct-qwik/src/register-source.ts b/packages/playwright-ct-qwik/src/register-source.ts
index ccf0c52..c4a176b 100644
--- a/packages/playwright-ct-qwik/src/register-source.ts
+++ b/packages/playwright-ct-qwik/src/register-source.ts
@@ -17,90 +17,61 @@
 // @ts-check
 // This file is injected into the registry as text, no dependencies are allowed.
 
-import __pwH from 'solid-js/h';
-import { createComponent as __pwSolidCreateComponent, render as __pwSolidRender } from 'solid-js/web';
-
-/** @typedef {import('../playwright-ct-core/types/component').JsxComponent} JsxComponent */
-/** @typedef {() => import('solid-js').JSX.Element} FrameworkComponent */
-
+import { JSXOutput, render } from '@builder.io/qwik';
+import { QWIK_LOADER } from '@builder.io/qwik/loader';
 /**
  * @param {any} component
  * @returns {component is JsxComponent}
  */
-function isJsxComponent(component) {
-  return typeof component === 'object' && component && component.__pw_type === 'jsx';
+// function isJsxComponent(component) {
+//   return typeof component === 'object' && component && component.__pw_type === 'jsx';
+// }
+
+export function addQwikLoader() {
+  const scriptEl = document.createElement('script');
+  const inlineScript = document.createTextNode(QWIK_LOADER);
+  scriptEl.appendChild(inlineScript);
+  document.body.appendChild(scriptEl);
 }
 
-/**
- * @param {any} child
- */
-function __pwCreateChild(child) {
-  if (Array.isArray(child))
-    return child.map(grandChild => __pwCreateChild(grandChild));
-  if (isJsxComponent(child))
-    return __pwCreateComponent(child);
-  return child;
-}
-
-/**
- * @param {JsxComponent} component
- * @returns {any[] | undefined}
- */
-function __pwJsxChildArray(component) {
-  if (!component.props.children)
-    return;
-  if (Array.isArray(component.props.children))
-    return component.props.children;
-  return [component.props.children];
-}
-
-/**
- * @param {JsxComponent} component
- */
-function __pwCreateComponent(component) {
-  const children = __pwJsxChildArray(component)?.map(child => __pwCreateChild(child)).filter(child => {
-    if (typeof child === 'string')
-      return !!child.trim();
-    return true;
-  });
-
-  if (typeof component.type === 'string')
-    return __pwH(component.type, component.props, children);
-
-  return __pwSolidCreateComponent(component.type, { ...component.props, children });
-}
+addQwikLoader();
 
 const __pwUnmountKey = Symbol('unmountKey');
 
-window.playwrightMount = async (component, rootElement, hooksConfig) => {
-  if (!isJsxComponent(component))
-    throw new Error('Object mount notation is not supported');
-
-  let App = () => __pwCreateComponent(component);
-  for (const hook of window.__pw_hooks_before_mount || []) {
-    const wrapper = await hook({ App, hooksConfig });
-    if (wrapper)
-      App = () => wrapper;
+window.playwrightMount = async (
+  component: JSXOutput,
+  rootElement: HTMLElement,
+  hooksConfig: unknown,
+) => {
+  // if (!isJsxComponent(component))
+  //   throw new Error('Object mount notation is not supported');
+
+  let componentToRender = component;
+  for (const hook of window['__pw_hooks_before_mount'] || []) {
+    const wrapper = await hook({ component, hooksConfig });
+    if (wrapper) {
+      componentToRender = wrapper;
+    }
   }
 
-  const unmount = __pwSolidRender(App, rootElement);
-  rootElement[__pwUnmountKey] = unmount;
+  const { cleanup } = await render(rootElement, componentToRender);
+
+  rootElement[__pwUnmountKey] = cleanup;
 
-  for (const hook of window.__pw_hooks_after_mount || [])
+  for (const hook of window['__pw_hooks_after_mount'] || [])
     await hook({ hooksConfig });
 };
 
-window.playwrightUnmount = async rootElement => {
-  const unmount = rootElement[__pwUnmountKey];
-  if (!unmount)
-    throw new Error('Component was not mounted');
+window.playwrightUnmount = async (rootElement) => {
+  const cleanup = rootElement[__pwcleanupKey];
+  if (!cleanup) throw new Error('Component was not mounted');
 
-  unmount();
+  cleanup();
 };
 
 window.playwrightUpdate = async (rootElement, component) => {
-  if (!isJsxComponent(component))
-    throw new Error('Object mount notation is not supported');
+  // if (!isJsxComponent(component))
+  //   throw new Error('Object mount notation is not supported');
 
   window.playwrightUnmount(rootElement);
   window.playwrightMount(component, rootElement, {});
diff --git a/packages/playwright-ct-qwik/src/register.d.ts b/packages/playwright-ct-qwik/src/register.d.ts
deleted file mode 100644
index 1f44530..0000000
--- a/packages/playwright-ct-qwik/src/register.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export default function pwRegister(components: Record<string, any>): void;
diff --git a/packages/playwright-ct-qwik/src/register.ts b/packages/playwright-ct-qwik/src/register.ts
index 82df6fe..19dd060 100644
--- a/packages/playwright-ct-qwik/src/register.ts
+++ b/packages/playwright-ct-qwik/src/register.ts
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-import { pwRegister } from './registerSource.mjs';
+import { pwRegister } from './register-source';
 
-export default (components) => {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export default (components: Record<string, any>): void => {
   pwRegister(components);
 };