diff --git a/.github/workflows/cluster.yaml b/.github/workflows/cluster.yaml
index 7cedd599..f8839da7 100644
--- a/.github/workflows/cluster.yaml
+++ b/.github/workflows/cluster.yaml
@@ -14,7 +14,7 @@ permissions: read-all
 jobs:
   client-tools:
     name: Stateless zot with shared reliable storage
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     # services:
     #   minio:
     #     image: minio/minio:edge-cicd
@@ -39,11 +39,6 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install rpm uidmap
           # install skopeo
-          . /etc/os-release
-          echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
-          curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | sudo apt-key add -
-          sudo apt-get update
-          sudo apt-get -y upgrade
           sudo apt-get -y install skopeo
 
           # install haproxy
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 541ac3c9..b0a8aeca 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -25,7 +25,7 @@ permissions: read-all
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       actions: read
       contents: read
@@ -58,24 +58,6 @@ jobs:
         go install github.com/wadey/gocovmerge@latest
         go get -u github.com/swaggo/swag/cmd/swag
         go mod download
-        sudo apt-get update
-        sudo apt-get -y install rpm uidmap
-        # install skopeo
-        . /etc/os-release
-        echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
-        curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | sudo apt-key add -
-        sudo apt-get update
-        sudo apt-get -y upgrade
-        sudo apt-get -y install skopeo
-        # install notation
-        curl -Lo notation.tar.gz https://github.com/notaryproject/notation/releases/download/v0.7.1-alpha.1/notation_0.7.1-alpha.1_linux_amd64.tar.gz
-        sudo tar xvzf notation.tar.gz -C /usr/bin notation
-        # install oras
-        curl -LO https://github.com/oras-project/oras/releases/download/v0.14.0/oras_0.14.0_linux_amd64.tar.gz
-        mkdir -p oras-install/
-        tar -zxf oras_0.14.0_*.tar.gz -C oras-install/
-        sudo mv oras-install/oras /usr/bin/
-        rm -rf oras_0.14.0_*.tar.gz oras-install/
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL