diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index ed5c4b8..20e5d58 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -47,49 +47,65 @@ jobs:
           ref: main
           path: bec_shared_actions
 
-      - name: Run shared CI action
-        uses: bec/bec_shared_actions/.gitea/workflows/shared-ci.yml@main
+      - name: Checkout Plugin and BEC Repositories
+        uses: bec/bec_shared_actions/checkout_repositories@main
         # uses: ./bec_shared_actions
         with:
           BEC_WIDGETS_BRANCH:   "${{ github.event.inputs.BEC_WIDGETS_BRANCH || 'main' }}"
           BEC_CORE_BRANCH:      "${{ github.event.inputs.BEC_CORE_BRANCH || 'main' }}"
           OPHYD_DEVICES_BRANCH: "${{ github.event.inputs.OPHYD_DEVICES_BRANCH || 'main' }}"
           BEC_PLUGIN_REPO_BRANCH: "${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.BEC_PLUGIN_REPO_BRANCH || 'main') || github.head_ref || github.ref_name }}"
-          PYTHON_VERSION:       "${{ github.event.inputs.PYTHON_VERSION || '3.11' }}"
-          BEC_PLUGIN_REPO_URL: "https://gitea.psi.ch/bec/${{ github.event.repository.name }}.git"
+          # PYTHON_VERSION:       "${{ github.event.inputs.PYTHON_VERSION || '3.11' }}"
+          PLUGIN_REPO_NAME: "${{ github.event.repository.name }}"
+          # APT_PACKAGES: "libgl1 libegl1 x11-utils libxkbcommon-x11-0 libdbus-1-3 xvfb libnss3 libxdamage1 libasound2t64 libatomic1 libxcursor1"
+
+      - name: Install external APT packages
+        uses: bec/bec_shared_actions/install_apt_packages@main
+        with:
           APT_PACKAGES: "libgl1 libegl1 x11-utils libxkbcommon-x11-0 libdbus-1-3 xvfb libnss3 libxdamage1 libasound2t64 libatomic1 libxcursor1"
 
-      - name: Checkout BEC Plugin Repository
-        run: |
-          chmod +x ./bec_shared_actions/give_runs_log.sh
-          ./bec_shared_actions/give_runs_log.sh "outputs/checkout.log"
-
-      - name: Checkout BEC Core
-        run: |
-          chmod +x ./bec_shared_actions/give_runs_log.sh
-          ./bec_shared_actions/give_runs_log.sh "outputs/checkout_bec_core.log"
-
-      - name: Checkout Ophyd Devices
-        run: |
-          chmod +x ./bec_shared_actions/give_runs_log.sh
-          ./bec_shared_actions/give_runs_log.sh "outputs/checkout_ophyd_devices.log"
-
-      - name: Checkout BEC Widgets
-        run: |
-          chmod +x ./bec_shared_actions/give_runs_log.sh
-          ./bec_shared_actions/give_runs_log.sh "outputs/checkout_bec_widgets.log"
-
-      - name: Install APT_PACKAGES
-        run: |
-          chmod +x ./bec_shared_actions/give_runs_log.sh
-          ./bec_shared_actions/give_runs_log.sh "outputs/install_apt_packages.log"
-
       - name: Install Python dependencies
-        run: |
-          chmod +x ./bec_shared_actions/give_runs_log.sh
-          ./bec_shared_actions/give_runs_log.sh "outputs/install_python_dependencies.log"
+        uses: bec/bec_shared_actions/install_python_env@main
+        with:
+          PYTHON_VERSION: "${{ github.event.inputs.PYTHON_VERSION || '3.11' }}"
+          PLUGIN_REPO_NAME: "${{ github.event.repository.name }}"
 
       - name: Run pytest for Plugin
-        run: |
-          chmod +x ./bec_shared_actions/give_runs_log.sh
-          ./bec_shared_actions/give_runs_log.sh "outputs/pytest_plugin.log"
\ No newline at end of file
+        uses: bec/bec_shared_actions/run_pytest_for_plugin@main
+        with:
+          PLUGIN_REPO_NAME: "${{ github.event.repository.name }}"
+
+      # - name: Checkout BEC Plugin Repository
+      #   run: |
+      #     chmod +x ./bec_shared_actions/give_runs_log.sh
+      #     ./bec_shared_actions/give_runs_log.sh "outputs/checkout.log"
+
+      # - name: Checkout BEC Core
+      #   run: |
+      #     chmod +x ./bec_shared_actions/give_runs_log.sh
+      #     ./bec_shared_actions/give_runs_log.sh "outputs/checkout_bec_core.log"
+
+      # - name: Checkout Ophyd Devices
+      #   run: |
+      #     chmod +x ./bec_shared_actions/give_runs_log.sh
+      #     ./bec_shared_actions/give_runs_log.sh "outputs/checkout_ophyd_devices.log"
+
+      # - name: Checkout BEC Widgets
+      #   run: |
+      #     chmod +x ./bec_shared_actions/give_runs_log.sh
+      #     ./bec_shared_actions/give_runs_log.sh "outputs/checkout_bec_widgets.log"
+
+      # - name: Install APT_PACKAGES
+      #   run: |
+      #     chmod +x ./bec_shared_actions/give_runs_log.sh
+      #     ./bec_shared_actions/give_runs_log.sh "outputs/install_apt_packages.log"
+
+      # - name: Install Python dependencies
+      #   run: |
+      #     chmod +x ./bec_shared_actions/give_runs_log.sh
+      #     ./bec_shared_actions/give_runs_log.sh "outputs/install_python_dependencies.log"
+
+      # - name: Run pytest for Plugin
+      #   run: |
+      #     chmod +x ./bec_shared_actions/give_runs_log.sh
+      #     ./bec_shared_actions/give_runs_log.sh "outputs/pytest_plugin.log"
\ No newline at end of file