diff --git a/docs/node-observ-lib/linux/.gitignore b/docs/node-observ-lib/.gitignore
similarity index 100%
rename from docs/node-observ-lib/linux/.gitignore
rename to docs/node-observ-lib/.gitignore
diff --git a/docs/node-observ-lib/linux/g.libsonnet b/docs/node-observ-lib/g.libsonnet
similarity index 100%
rename from docs/node-observ-lib/linux/g.libsonnet
rename to docs/node-observ-lib/g.libsonnet
diff --git a/docs/node-observ-lib/macos/jsonnetfile.json b/docs/node-observ-lib/jsonnetfile.json
similarity index 100%
rename from docs/node-observ-lib/macos/jsonnetfile.json
rename to docs/node-observ-lib/jsonnetfile.json
diff --git a/docs/node-observ-lib/linux/annotations.libsonnet b/docs/node-observ-lib/linux/annotations.libsonnet
index 3d1f58b771..5b8cb7ff79 100644
--- a/docs/node-observ-lib/linux/annotations.libsonnet
+++ b/docs/node-observ-lib/linux/annotations.libsonnet
@@ -1,4 +1,4 @@
-local g = import './g.libsonnet';
+local g = import '../g.libsonnet';
 local commonlib = import 'common-lib/common/main.libsonnet';
 {
   new(this):
diff --git a/docs/node-observ-lib/linux/dashboards.libsonnet b/docs/node-observ-lib/linux/dashboards.libsonnet
index abc0a6eaaa..f09bef6415 100644
--- a/docs/node-observ-lib/linux/dashboards.libsonnet
+++ b/docs/node-observ-lib/linux/dashboards.libsonnet
@@ -1,4 +1,4 @@
-local g = import './g.libsonnet';
+local g = import '../g.libsonnet';
 local logslib = import 'github.com/grafana/jsonnet-libs/logs-lib/logs/main.libsonnet';
 {
   local root = self,
diff --git a/docs/node-observ-lib/linux/jsonnetfile.json b/docs/node-observ-lib/linux/jsonnetfile.json
deleted file mode 100644
index 69b58cc74b..0000000000
--- a/docs/node-observ-lib/linux/jsonnetfile.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "version": 1,
-  "dependencies": [
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs.git",
-          "subdir": "common-lib"
-        }
-      },
-      "version": "master"
-    },
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/grafana/grafonnet.git",
-          "subdir": "gen/grafonnet-v10.0.0"
-        }
-      },
-      "version": "main"
-    },
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs.git",
-          "subdir": "logs-lib"
-        }
-      },
-      "version": "master"
-    }
-  ],
-  "legacyImports": true
-}
\ No newline at end of file
diff --git a/docs/node-observ-lib/linux/links.libsonnet b/docs/node-observ-lib/linux/links.libsonnet
index ac61ad7ad5..cc24910a65 100644
--- a/docs/node-observ-lib/linux/links.libsonnet
+++ b/docs/node-observ-lib/linux/links.libsonnet
@@ -1,4 +1,4 @@
-local g = import './g.libsonnet';
+local g = import '../g.libsonnet';
 local commonlib = import 'common-lib/common/main.libsonnet';
 {
   new(this):
diff --git a/docs/node-observ-lib/linux/panels.libsonnet b/docs/node-observ-lib/linux/panels.libsonnet
index ddee5a910f..281c942ea5 100644
--- a/docs/node-observ-lib/linux/panels.libsonnet
+++ b/docs/node-observ-lib/linux/panels.libsonnet
@@ -1,4 +1,4 @@
-local g = import './g.libsonnet';
+local g = import '../g.libsonnet';
 local commonlib = import 'common-lib/common/main.libsonnet';
 local utils = commonlib.utils;
 {
diff --git a/docs/node-observ-lib/linux/targets.libsonnet b/docs/node-observ-lib/linux/targets.libsonnet
index 142526155c..3101099b87 100644
--- a/docs/node-observ-lib/linux/targets.libsonnet
+++ b/docs/node-observ-lib/linux/targets.libsonnet
@@ -1,4 +1,4 @@
-local g = import './g.libsonnet';
+local g = import '../g.libsonnet';
 local prometheusQuery = g.query.prometheus;
 local lokiQuery = g.query.loki;
 
diff --git a/docs/node-observ-lib/linux/variables.libsonnet b/docs/node-observ-lib/linux/variables.libsonnet
index c9b2cb3ad4..e2f1ace8c4 100644
--- a/docs/node-observ-lib/linux/variables.libsonnet
+++ b/docs/node-observ-lib/linux/variables.libsonnet
@@ -1,5 +1,5 @@
 // variables.libsonnet
-local g = import './g.libsonnet';
+local g = import '../g.libsonnet';
 local var = g.dashboard.variable;
 local commonlib = import 'common-lib/common/main.libsonnet';
 local utils = commonlib.utils;
diff --git a/docs/node-observ-lib/macos/.gitignore b/docs/node-observ-lib/macos/.gitignore
deleted file mode 100644
index f9bf6ba815..0000000000
--- a/docs/node-observ-lib/macos/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-jsonnetfile.lock.json
-vendor
diff --git a/docs/node-observ-lib/macos/g.libsonnet b/docs/node-observ-lib/macos/g.libsonnet
deleted file mode 100644
index 6da9f4eef9..0000000000
--- a/docs/node-observ-lib/macos/g.libsonnet
+++ /dev/null
@@ -1 +0,0 @@
-import 'github.com/grafana/grafonnet/gen/grafonnet-v10.0.0/main.libsonnet'
diff --git a/docs/node-observ-lib/macos/main.libsonnet b/docs/node-observ-lib/macos/main.libsonnet
index 41c21f2e10..ca898f9b3e 100644
--- a/docs/node-observ-lib/macos/main.libsonnet
+++ b/docs/node-observ-lib/macos/main.libsonnet
@@ -1,7 +1,7 @@
+local g = import '../g.libsonnet';
 local nodelib = import '../linux/main.libsonnet';
 local alerts = import './alerts.libsonnet';
 local config = import './config.libsonnet';
-local g = import './g.libsonnet';
 local panels = import './panels.libsonnet';
 local targets = import './targets.libsonnet';
 
diff --git a/docs/node-observ-lib/macos/panels.libsonnet b/docs/node-observ-lib/macos/panels.libsonnet
index f62df8aebf..e0cca3131d 100644
--- a/docs/node-observ-lib/macos/panels.libsonnet
+++ b/docs/node-observ-lib/macos/panels.libsonnet
@@ -1,4 +1,4 @@
-local g = import './g.libsonnet';
+local g = import '../g.libsonnet';
 local commonlib = import 'common-lib/common/main.libsonnet';
 local utils = commonlib.utils;
 {
diff --git a/docs/node-observ-lib/macos/targets.libsonnet b/docs/node-observ-lib/macos/targets.libsonnet
index 658824dc84..25efc16572 100644
--- a/docs/node-observ-lib/macos/targets.libsonnet
+++ b/docs/node-observ-lib/macos/targets.libsonnet
@@ -1,4 +1,4 @@
-local g = import './g.libsonnet';
+local g = import '../g.libsonnet';
 local prometheusQuery = g.query.prometheus;
 local lokiQuery = g.query.loki;
 
diff --git a/docs/node-observ-lib/macos/mixin.libsonnet b/docs/node-observ-lib/mixin-mac.libsonnet
similarity index 78%
rename from docs/node-observ-lib/macos/mixin.libsonnet
rename to docs/node-observ-lib/mixin-mac.libsonnet
index 51d7826fee..d0b56adf12 100644
--- a/docs/node-observ-lib/macos/mixin.libsonnet
+++ b/docs/node-observ-lib/mixin-mac.libsonnet
@@ -1,4 +1,4 @@
-local macoslib = import './main.libsonnet';
+local macoslib = import './macos/main.libsonnet';
 local macos = macoslib.new();
 
 {
diff --git a/docs/node-observ-lib/linux/mixin.libsonnet b/docs/node-observ-lib/mixin.libsonnet
similarity index 84%
rename from docs/node-observ-lib/linux/mixin.libsonnet
rename to docs/node-observ-lib/mixin.libsonnet
index f902699f3e..284f307dd4 100644
--- a/docs/node-observ-lib/linux/mixin.libsonnet
+++ b/docs/node-observ-lib/mixin.libsonnet
@@ -1,7 +1,4 @@
-local g = import './g.libsonnet';
-local nodelib = import './main.libsonnet';
-
-
+local nodelib = import './linux/main.libsonnet';
 local linux =
   nodelib.new()
   + nodelib.withConfigMixin({
@@ -12,7 +9,6 @@ local linux =
     dashboardTags: ['node-exporter-mixin'],
     uid: 'node',
   });
-
 {
   grafanaDashboards+:: linux.grafana.dashboards,
   prometheusAlerts+:: linux.prometheus.alerts,