diff --git a/.github/actions/prepare-worker/action.yml b/.github/actions/prepare-worker/action.yml
deleted file mode 100644
index dc9f4c179..000000000
--- a/.github/actions/prepare-worker/action.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Prepare Job Worker
-description: Prepares a job worker for running Gradle tasks on SKIE project
-
-runs:
-  using: composite
-  steps:
-    - uses: actions/setup-java@v3
-      with:
-        distribution: temurin
-        java-version: 17
-    - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
-      env:
-        GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: 'true'
-      with:
-        cache-disabled: true
diff --git a/.github/workflows/new-smoke-tests.yml b/.github/workflows/new-smoke-tests.yml
new file mode 100644
index 000000000..0a79f1488
--- /dev/null
+++ b/.github/workflows/new-smoke-tests.yml
@@ -0,0 +1,18 @@
+name: Smoke Tests [New]
+
+on:
+  push:
+    branches:
+      - '**'
+
+permissions:
+  contents: read
+  checks: write
+
+jobs:
+  smoke-tests:
+    name: Smoke Tests
+    runs-on: self-hosted
+    steps:
+      - uses: touchlab/SKIE@tk/smoke-tests
+    
\ No newline at end of file
diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
index b5bd63250..749418ab8 100644
--- a/.github/workflows/smoke-tests.yml
+++ b/.github/workflows/smoke-tests.yml
@@ -1,9 +1,9 @@
 name: Smoke Tests
 
 on:
-  push:
-    branches:
-      - '**'
+#  push:
+#    branches:
+#      - '**'
   pull_request_target:
     branches:
       - main
diff --git a/action.yml b/action.yml
new file mode 100644
index 000000000..474db0c57
--- /dev/null
+++ b/action.yml
@@ -0,0 +1,36 @@
+name: Prepare Job Worker
+description: Prepares a job worker for running Gradle tasks on SKIE project
+
+runs:
+  using: composite
+  steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+      with:
+      submodules: true
+      token: ${{ secrets.ACCEPTANCE_TESTS_TOKEN }}
+    - uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 17
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+      env:
+        GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: 'true'
+      with:
+        cache-disabled: true
+    - name: Run Acceptance Tests
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: ':acceptance-tests:functional__kgp_latestTest'
+        build-root-directory: SKIE
+      env:
+        KOTLIN_LINK_MODE: ${{ inputs.linkage }}
+        KOTLIN_BUILD_CONFIGURATION: ${{ inputs.configuration }}
+      - name: Publish Test Report
+      uses: mikepenz/action-junit-report@v3
+      if: ${{ failure() || success() }}
+      with:
+        check_name: "Smoke Test Reports - Functional Tests"
+        report_paths: 'SKIE/acceptance-tests/build/test-results/functional__*/TEST-*.xml'
+        require_tests: true
\ No newline at end of file