diff --git a/.github/workflows/package-development-workflow.yml b/.github/workflows/package-development-workflow.yml
index e7edfe1..fb39b21 100644
--- a/.github/workflows/package-development-workflow.yml
+++ b/.github/workflows/package-development-workflow.yml
@@ -27,7 +27,7 @@ jobs:
     name: Build and Test
     runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/simatic-ax/ci-images/apax-ci-image:3.5.0
+      image: ghcr.io/simatic-ax/ci-images/apax-ci-image:4.2.0
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -39,14 +39,14 @@ jobs:
           ref: ${{ inputs.ref != '' && inputs.ref || github.ref }}
 
       - name: Login to required registries
-        uses: simatic-ax/actions/apax-login@v3
+        uses: simatic-ax/actions/apax-login@v4
         with:
           apax-token: ${{ secrets.APAX_TOKEN }}
           registries: |
             https://npm.pkg.github.com/,${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
-        uses: simatic-ax/actions/apax-install@v3
+        uses: simatic-ax/actions/apax-install@v4
         with:
           immutable: true
 
@@ -61,7 +61,7 @@ jobs:
       #       --log Debug
 
       - name: Test source code
-        uses: simatic-ax/actions/apax-test@v3
+        uses: simatic-ax/actions/apax-test@v4
         with:
           coverage: true
           loglevel: debug
diff --git a/.github/workflows/package-release-workflow.yml b/.github/workflows/package-release-workflow.yml
index e4ab5e5..a87f85b 100644
--- a/.github/workflows/package-release-workflow.yml
+++ b/.github/workflows/package-release-workflow.yml
@@ -28,7 +28,7 @@ jobs:
     needs: call-development
     runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/simatic-ax/ci-images/apax-ci-image:3.5.0
+      image: ghcr.io/simatic-ax/ci-images/apax-ci-image:4.2.0
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -49,24 +49,25 @@ jobs:
       #     path: bin
 
       - name: Version package
-        uses: simatic-ax/actions/apax-version@v3
+        uses: simatic-ax/actions/apax-version@v4
         with:
           version: ${{ github.event.release.tag_name }}
 
       - name: Package source code
-        uses: simatic-ax/actions/apax-pack@v3
+        uses: simatic-ax/actions/apax-pack@v4
         with:
           key: ${{ secrets.APAX_SIGNKEY_V2 }}
+          key-version: "v2"
 
       - name: Login to required registries
-        uses: simatic-ax/actions/apax-login@v3
+        uses: simatic-ax/actions/apax-login@v4
         with:
           apax-token: ${{ secrets.APAX_TOKEN }}
           registries: |
             https://npm.pkg.github.com/,${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish apax package
-        uses: simatic-ax/actions/apax-publish@v3
+        uses: simatic-ax/actions/apax-publish@v4
         with:
           registries: |
             https://npm.pkg.github.com
diff --git a/.gitignore b/.gitignore
index 4336cfa..bf746d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 [Tt]est[Rr]esult*/
 *.tgz
 *.tracerec.json
-obj/
\ No newline at end of file
+obj/
+/.vs
diff --git a/apax-lock.json b/apax-lock.json
index 48e6fe6..fd9405b 100644
--- a/apax-lock.json
+++ b/apax-lock.json
@@ -7,12 +7,12 @@
     "name": "@simatic-ax/mocks",
     "version": "0.1.3",
     "dependencies": {
-      "@ax/system-timer": "^10.0.24"
+      "@ax/system-timer": "^10.2.7"
     },
     "devDependencies": {
       "@ax/sdk": "^2510.0.0",
-      "@simatic-ax/snippetscollection": "^1.0.0",
-      "@ax/axunit-mocking": "^8.0.33"
+      "@simatic-ax/snippetscollection": "^1.1.0",
+      "@ax/axunit-mocking": "^8.4.20"
     },
     "catalogs": {
       "@ax/simatic-ax": "^2510.0.0"
diff --git a/apax.yml b/apax.yml
index 72a3849..b39bfce 100644
--- a/apax.yml
+++ b/apax.yml
@@ -15,18 +15,21 @@ targets:
   - 'llvm'
 registries:
   '@simatic-ax': 'https://npm.pkg.github.com/'
-
+# Dependencies
+publicKeys:
+  "@simatic-ax":
+    "v1": "3792a7e926775425ccdd29ceed8c368c3008b5b33d7d5550b3cb1f58093e1dff"
+    "v2": "7af3e394eb2b285a3d99ab8e1f745cc6db75704b30a80393339c721a92ffffd9"
+catalogs:
+  "@ax/simatic-ax": ^2510.0.0
 devDependencies:
   "@ax/sdk": ^2510.0.0
-  "@simatic-ax/snippetscollection": ^1.0.0
-  "@ax/axunit-mocking": ^8.0.33
+  "@simatic-ax/snippetscollection": ^1.1.0
+  "@ax/axunit-mocking": ^8.4.20
 dependencies:
-  "@ax/system-timer": ^10.0.24
-
+  "@ax/system-timer": ^10.2.7
 files:
   - 'README.md'
   - 'LICENSE.md'
   - 'docs'
   - 'src'
-catalogs:
-  "@ax/simatic-ax": ^2510.0.0