diff --git a/Magefile.go b/Magefile.go
index 484fa9c..12096af 100644
--- a/Magefile.go
+++ b/Magefile.go
@@ -135,23 +135,24 @@ func (Frontend) Build() error {
 	if err != nil {
 		return err
 	}
-	return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:build")
+	return runToolboxCmd("yarn", "build")
 	// return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:build", "--preserveConsole")
 }
 
 // Test runs frontend tests
 func (Frontend) Test() error {
-	return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:test")
+	return runToolboxCmd("yarn", "test")
 }
 
 // Dev runs frontend in development mode
 func (Frontend) Dev() error {
-	return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:dev")
+	return runToolboxCmd("yarn", "dev")
 }
 
-// Watch runs frontend in development mode + autoreload on changes
+// Watch runs frontend in development mode + autoreload on changes.
+// Same as dev. Probably remove it?
 func (Frontend) Watch() error {
-	return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:dev", "--watch")
+	return runToolboxCmd("yarn", "dev")
 }
 
 type Backend mg.Namespace
diff --git a/docker-compose.yaml b/docker-compose.yaml
deleted file mode 100644
index ddc991a..0000000
--- a/docker-compose.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-services:
-  grafana:
-    user: root
-    container_name: 'grafadruid-druid-datasource'
-
-    build:
-      context: ./.config
-      args:
-        grafana_image: ${GRAFANA_IMAGE:-grafana-enterprise}
-        grafana_version: ${GRAFANA_VERSION:-10.4.0}
-        development: ${DEVELOPMENT:-false}
-    ports:
-      - 3000:3000/tcp
-      - 2345:2345/tcp # delve
-    security_opt:
-      - "apparmor:unconfined"
-      - "seccomp:unconfined"
-    cap_add:
-      - SYS_PTRACE
-    volumes:
-      - ./dist:/var/lib/grafana/plugins/grafadruid-druid-datasource
-      - ./provisioning:/etc/grafana/provisioning
-      - .:/root/grafadruid-druid-datasource
-
-    environment:
-      NODE_ENV: development
-      GF_LOG_FILTERS: plugin.grafadruid-druid-datasource:debug
-      GF_LOG_LEVEL: debug
-      GF_DATAPROXY_LOGGING: 1
-      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafadruid-druid-datasource
diff --git a/docker/toolbox/Dockerfile b/docker/toolbox/Dockerfile
index 0c71af3..4209786 100644
--- a/docker/toolbox/Dockerfile
+++ b/docker/toolbox/Dockerfile
@@ -1,5 +1,5 @@
-FROM node:16-alpine3.16
+FROM node:22-alpine3.19
 WORKDIR /workspace
 ENV CGO_ENABLED=0
-RUN apk add --no-cache git go python3 && git config --global --add safe.directory /workspace && npm install -g npm@8.19.2
+RUN apk add --no-cache git go python3 && git config --global --add safe.directory /workspace
 ENTRYPOINT ["tail", "-f"]
diff --git a/mage b/mage
index ad70327..99d451c 100755
Binary files a/mage and b/mage differ
diff --git a/mage-macos b/mage-macos
deleted file mode 100755
index 06505fd..0000000
Binary files a/mage-macos and /dev/null differ