diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b895d5302..a2fcad365 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -237,21 +237,13 @@ jobs:
   docker:
     needs: parse
     if: ${{ github.repository == 'Ericsson/CodeCompass' && (github.ref_name == 'master' || startsWith(github.ref_name, 'release/') == true) }}
-
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Build Docker images
-        uses: ./.github/workflows/docker.yml
-        with:
-          tag-latest: ${{ github.ref_name == 'master' }}
+    uses: ./.github/workflows/docker.yml
+    with:
+      tag-latest: ${{ github.ref_name == 'master' }}
 
 
   ## TARBALL JOB
   tarball:
     needs: parse
     if: ${{ github.repository == 'Ericsson/CodeCompass' && (github.ref_name == 'master' || startsWith(github.ref_name, 'release/') == true) }}
-
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Create Tarball
-        uses: ./.github/workflows/tarball.yml
+    uses: ./.github/workflows/tarball.yml