diff --git a/.github/workflows/build-docker-test.yml b/.github/workflows/build-docker-test.yml
index 5fef7dc..6ab63fb 100644
--- a/.github/workflows/build-docker-test.yml
+++ b/.github/workflows/build-docker-test.yml
@@ -1,12 +1,5 @@
 on: [push]
 jobs:
-  ls:
-    runs-on: docker
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-      - name: List Files
-        run: ls -al
   test_docker:
     uses: ./.github/workflows/build-docker.yml
     with:
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index ec23c8d..7b16e93 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -17,10 +17,8 @@ jobs:
   build-go:
     runs-on: docker
     container:
-      image: docker:27.4.0-rc.2-dind-alpine3.20
+      image: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/pipeline-container/dind:27.4.0-rc2
     steps:
-      - name: Install git
-        run: apk add --no-cache git
       - name: Clone Repository
         run: git clone https://wf:${{ github.token }}@{{ github.server_url#https:// }}/{{ github.repository_owner }}/{{ github.repository }}.git {{ github.workspace }}
       - name: Check Out Branch
diff --git a/.github/workflows/build-go.yml b/.github/workflows/build-go.yml
index 5bac187..3ba80d7 100644
--- a/.github/workflows/build-go.yml
+++ b/.github/workflows/build-go.yml
@@ -23,12 +23,14 @@ jobs:
   build-go:
     runs-on: docker
     container:
-      image: docker.io/node:20-bookworm
+      image: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/pipeline-container/go:1.23
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: ${{ inputs.go-version }}
+      - name: Clone Repository
+        run: git clone https://wf:${{ github.token }}@{{ github.server_url#https:// }}/{{ github.repository_owner }}/{{ github.repository }}.git {{ github.workspace }}
+      - name: Check Out Branch
+        run: |
+          cd ${{ github.workspace }}
+          git checkout ${{ github.ref }}
       - name: Set up Go
         run: |
           go version