diff --git a/.github/workflows/ffo-test.yml b/.github/workflows/ffo-test.yml
index 4c10abce7f..2114e015e6 100644
--- a/.github/workflows/ffo-test.yml
+++ b/.github/workflows/ffo-test.yml
@@ -12,7 +12,7 @@ permissions:
 jobs:
   depot-gh-cache:
     timeout-minutes: 20
-    runs-on: depot-ubuntu-22.04-8
+    runs-on: depot-ubuntu-22.04-16
     steps:
       - uses: actions/checkout@v4
         with:
@@ -47,23 +47,3 @@ jobs:
           name: depot-cache
           path: .build
           include-hidden-files: true
-
-  gh-runner-cache:
-    timeout-minutes: 20
-    runs-on:
-      group: zitadel-public
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: docker/setup-buildx-action@v3
-      - uses: docker/bake-action@v6
-        with:
-          source: .
-          push: false
-          targets: ci
-      - uses: actions/upload-artifact@v4
-        with:
-          name: gh-runner-cache
-          path: .build
-          include-hidden-files: true
\ No newline at end of file
diff --git a/Dockerfile.devcontainer b/Dockerfile.devcontainer
index a1dc4a86db..5993ef6e37 100644
--- a/Dockerfile.devcontainer
+++ b/Dockerfile.devcontainer
@@ -3,9 +3,6 @@ FROM ubuntu:22.04
 ARG NODE_VERSION=22
 ARG GO_VERSION=1.24.0
 ARG SASS_VERSION=1.64.1
-ARG GOLANG_CI_VERSION=1.64.5
-ARG BIN="/usr/local/bin"
-ARG VERSION="1.50.0"
 ARG TARGETOS
 ARG TARGETARCH