diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1997901f6b..a8d2387514 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -36,9 +36,9 @@ jobs:
     name: "Build Flatcar packages"
     runs-on:
       - self-hosted
-      - debian
+      - ubuntu
       - build
-      - x64
+      - amd64
     strategy:
       fail-fast: false
       matrix:
@@ -56,13 +56,9 @@ jobs:
           sudo ln -s /bin/bash /bin/sh
           sudo apt-get update
           sudo apt-get install -y ca-certificates curl git gnupg lsb-release python3 python3-packaging qemu-user-static zstd
-          sudo mkdir -p /etc/apt/keyrings
-          curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-          echo \
-            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
-            $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-          sudo apt-get update
-          sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v4
 
       - name: Checkout scripts
         uses: actions/checkout@v4
diff --git a/.github/workflows/run-kola-tests.yaml b/.github/workflows/run-kola-tests.yaml
index a5e7ebf548..22002dbde1 100644
--- a/.github/workflows/run-kola-tests.yaml
+++ b/.github/workflows/run-kola-tests.yaml
@@ -19,7 +19,7 @@ jobs:
     name: "Run Kola tests"
     runs-on:
       - self-hosted
-      - debian
+      - ubuntu
       - kola
       - ${{ matrix.arch }}
     strategy:
@@ -38,15 +38,6 @@ jobs:
           sudo systemctl stop dnsmasq
           sudo systemctl mask dnsmasq
 
-          # Install Docker-CE
-          sudo mkdir -p /etc/apt/keyrings
-          curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-          echo \
-            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
-            $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-          sudo apt-get update
-          sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-
           # Set up MASQUERADE. Don't care much to secure it.
           # This is needed for the VMs kola spins up to have internet access.
           DEFAULT_ROUTE_DEVICE=$(ip -j route sh default |jq -r .[0].dev)
@@ -54,6 +45,9 @@ jobs:
           sudo iptables -I FORWARD -o $DEFAULT_ROUTE_DEVICE -j ACCEPT
           sudo iptables -I FORWARD -i $DEFAULT_ROUTE_DEVICE -j ACCEPT
 
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v4
+
       - uses: actions/checkout@v4
         with:
           path: scripts
@@ -247,7 +241,7 @@ jobs:
     if: always() && !cancelled()
     runs-on:
       - self-hosted
-      - debian
+      - ubuntu
       - kola
     permissions:
       pull-requests: write
diff --git a/.github/workflows/update-sdk.yaml b/.github/workflows/update-sdk.yaml
index ce5dfa01a7..bc4dd5e32a 100644
--- a/.github/workflows/update-sdk.yaml
+++ b/.github/workflows/update-sdk.yaml
@@ -39,7 +39,7 @@ jobs:
     name: "Build an updated SDK container image"
     runs-on:
       - self-hosted
-      - debian
+      - ubuntu
       - build
       - x64
     strategy:
@@ -59,13 +59,9 @@ jobs:
           sudo rm /bin/sh
           sudo ln -s /bin/bash /bin/sh
           sudo apt-get install -y ca-certificates curl gnupg lsb-release qemu-user-static git jq openssh-client rsync zstd
-          sudo mkdir -p /etc/apt/keyrings
-          curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-          echo \
-            "deb [signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
-            $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-          sudo apt-get update
-          sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v4
 
       - uses: actions/checkout@v4
         id: step2