diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 1077fce..c0a913f 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -34,9 +34,15 @@ runs:
       run: |
         sudo apt-get update
         sudo apt-get install -y \
+          asciidoctor \
           libvirglrenderer-dev \
           libepoxy-dev \
           libdrm-dev \
           libpipewire-0.3-dev \
           clang-format \
           libclang-dev
+        curl -OL https://github.com/containers/libkrun/archive/refs/tags/v1.17.0.tar.gz
+        tar xf v1.17.0.tar.gz
+        cd libkrun-1.17.0
+        make
+        sudo make PREFIX=/usr install
diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index 3956dd0..173cd3e 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -2,6 +2,30 @@ name: Code Quality
 on: [pull_request]
 
 jobs:
+  code-quality-linux-x86_64:
+    name: krunvm (Linux x86_64)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup build environment
+        uses: ./.github/actions/setup-build-env
+
+      - name: Clippy (default)
+        run: cargo clippy --locked -- -D warnings
+
+  code-quality-linux-aarch64:
+    name: krunvm (Linux aarch64)
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup build environment
+        uses: ./.github/actions/setup-build-env
+
+      - name: Clippy (default)
+        run: cargo clippy --locked -- -D warnings
+
   code-quality-macos:
     name: krunvm (macOS aarch64)
     runs-on: macos-latest
diff --git a/src/commands/start.rs b/src/commands/start.rs
index 9b8977d..6c1db67 100644
--- a/src/commands/start.rs
+++ b/src/commands/start.rs
@@ -68,10 +68,8 @@ impl StartCmd {
             Vec::new()
         };
 
-        let env_pairs: Vec<CString> = if self.envs.is_some() {
-            self.envs
-                .unwrap()
-                .into_iter()
+        let env_pairs: Vec<CString> = if let Some(envs) = self.envs {
+            envs.into_iter()
                 .map(|val| CString::new(val).unwrap())
                 .collect()
         } else {