diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c32b84..872bcdf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,16 +44,20 @@ jobs:
       run: nix flake check
 
   build-ui-metadata:
-    name: "build-ui-metadata (${{matrix.runs-on}})"
+    name: "build-ui-metadata (${{matrix.runs-on.os}}, ${{matrix.runs-on.arch}})"
     runs-on:
     - self-hosted
-    - ${{matrix.runs-on}}
+    - ${{matrix.runs-on.os}}
     strategy:
       fail-fast: false
       matrix:
         runs-on:
-        - macOS
-        - Linux
+        - os: macOS
+          arch: aarch64-darwin
+        - os: Linux
+          arch: x86_64-linux
+        - os: Linux
+          arch: aarch64-linux
 
     steps:
     - uses: actions/checkout@v4
@@ -61,19 +65,23 @@ jobs:
     - name: Build .#ui_metadata_farm
       if: "!contains(github.event.head_commit.message, 'noci')"
       run: |
-        nix build .#ui_metadata_farm
+        nix build .#packages.${{matrix.runs-on.arch}}.ui_metadata_farm
 
   build-sample-environments:
-    name: "build-sample-environments (${{matrix.runs-on}})"
+    name: "build-sample-environments (${{matrix.runs-on.os}}, ${{matrix.runs-on.arch}})"
     runs-on:
     - self-hosted
-    - ${{matrix.runs-on}}
+    - ${{matrix.runs-on.os}}
     strategy:
       fail-fast: false
       matrix:
         runs-on:
-        - macOS
-        - Linux
+        - os: macOS
+          arch: aarch64-darwin
+        - os: Linux
+          arch: x86_64-linux
+        - os: Linux
+          arch: aarch64-linux
 
     steps:
     - uses: actions/checkout@v4
@@ -81,7 +89,7 @@ jobs:
     - name: Build .#sample_environments_farm
       if: "!contains(github.event.head_commit.message, 'noci')"
       run: |
-        nix build .#sample_environments_farm
+        nix build .#packages.${{matrix.runs-on.arch}}.sample_environments_farm
 
   test:
     name: ${{ matrix.suite.name }} (${{ matrix.runs-on }}${{ matrix.suite.flags && format(', {0}', matrix.suite.flags) || '' }})
diff --git a/modules/kernels/go/language-server-gopls/go-parser.nix b/modules/kernels/go/language-server-gopls/go-parser.nix
index a9e3cb9..f6e6039 100644
--- a/modules/kernels/go/language-server-gopls/go-parser.nix
+++ b/modules/kernels/go/language-server-gopls/go-parser.nix
@@ -11,7 +11,11 @@ buildGoModule rec {
     owner = "codedownio";
     repo = "go-notebook-language-server";
     rev = "v${version}";
+<<<<<<< gnls
+    hash = "sha256-bOh7LbPxs+olEGKrNnnoq6xMhoRRSeZCV6GgJ7CUPyk=";
+=======
     hash = "sha256-SdN/v4psQRQ8O+3BosYgcZzBZSxNytVmw1A/lM2fQ/4=";
+>>>>>>> main
   };
 
   sourceRoot = "${src.name}/go-parser";
diff --git a/modules/kernels/go/language-server-gopls/language-server-gopls.nix b/modules/kernels/go/language-server-gopls/language-server-gopls.nix
index 9baa19c..6421587 100644
--- a/modules/kernels/go/language-server-gopls/language-server-gopls.nix
+++ b/modules/kernels/go/language-server-gopls/language-server-gopls.nix
@@ -53,9 +53,9 @@ common.writeTextDirWithMetaAndPassthru gopls.meta passthru "lib/codedown/languag
   description = gopls.meta.description;
   icon = ../go-logo-64x64.png;
   extensions = ["go"];
-  notebook_suffix = ".go";
+  notebook_suffix = "";
   kernel_name = kernelName;
-  header_lines = ["package Notebook"];
+  header_lines = [];
   attrs = attrs;
   type = "stream";
   args = [