diff --git a/.github/workflows/install-test.yml b/.github/workflows/install-test.yml
index 74d3fed..2ebf10b 100644
--- a/.github/workflows/install-test.yml
+++ b/.github/workflows/install-test.yml
@@ -29,7 +29,7 @@ jobs:
   Build-install-ubuntu:
     runs-on:
       group: Default
-      labels: ubuntu18
+      labels: ubuntu20
     steps:
       - name: Check out repository code, branch='${{ github.ref }}'
         uses: actions/checkout@v2
diff --git a/.github/workflows/pkg-build-workflow.yml b/.github/workflows/pkg-build-workflow.yml
index 7442585..a4ae180 100644
--- a/.github/workflows/pkg-build-workflow.yml
+++ b/.github/workflows/pkg-build-workflow.yml
@@ -17,8 +17,16 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v2
+
+      - name: Create required directories
+        run: mkdir -p /tmp/${{ github.sha }}
+
       - name: CentOS 7 - Package build
-        run: sudo docker run --rm okynos/fim-builder:centos7 ${{ github.ref_name }}
+        run: sudo docker run --rm docker.io/okynos/fim-builder:centos7 ${{ github.ref_name }}
+
+      - name: Clean test output
+        if: always()
+        run: sudo rm -rf /tmp/${{ github.sha }}
 
   Pkg-build-macos:
     runs-on: macos-latest
diff --git a/.github/workflows/ubuntu-test.yml b/.github/workflows/ubuntu-test.yml
index 0570907..1d66bf6 100644
--- a/.github/workflows/ubuntu-test.yml
+++ b/.github/workflows/ubuntu-test.yml
@@ -8,8 +8,11 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
 
+      - name: Create required directories
+        run: mkdir -p /tmp/${{ github.sha }}
+
       - name: Ubuntu 16.04 - Package build
-        run: sudo docker run -v /tmp/${{ github.sha }}:/tmp/output --rm okynos/fim-builder:xenial ${{ github.ref_name }}
+        run: sudo docker run -v /tmp/${{ github.sha }}:/tmp/output --rm docker.io/okynos/fim-builder:xenial ${{ github.ref_name }}
 
       - name: Archive output package
         uses: actions/upload-artifact@v4
@@ -17,12 +20,16 @@ jobs:
           name: fim_${{ github.sha }}_amd64.deb
           path: /tmp/${{ github.sha }}/fim*.deb
           retention-days: 5
+
+      - name: Clean test output
+        if: always()
+        run: sudo rm -rf /tmp/${{ github.sha }}
   
   Audit_tests:
     needs: Package_build
     runs-on:
       group: Default
-      labels: ubuntu18
+      labels: ubuntu20
 
     steps:
       - name: Check out repository code, branch='${{ github.ref }}'