diff --git a/boards/amd64.yaml b/boards/amd64.yaml
index 9c69dd6..f94006f 100644
--- a/boards/amd64.yaml
+++ b/boards/amd64.yaml
@@ -1,3 +1,5 @@
 architecture: amd64
-gadget: joule
-kernel: joule-linux
+gadget: pc=18
+kernel: pc-kernel=18
+model: ppl-hub-amd64
+display-name "ppl Hub (amd64)"
diff --git a/boards/opi0.yaml b/boards/opi0.yaml
index 510d1b0..7a49024 100644
--- a/boards/opi0.yaml
+++ b/boards/opi0.yaml
@@ -1,3 +1,5 @@
 architecture: armhf
 gadget: orangepi-zero-gadget
 kernel: orangepi-zero-kernel
+model: ppl-hub-opi0
+display-name: "ppl Hub (Orange Pi Zero)"
diff --git a/boards/rpi2.yaml b/boards/rpi2.yaml
index 180b7e9..9ae1c9e 100644
--- a/boards/rpi2.yaml
+++ b/boards/rpi2.yaml
@@ -1,3 +1,5 @@
 architecture: armhf
-gadget: pi2
-kernel: pi2-kernel
+gadget: pi2=18
+kernel: pi-kernel=18-pi2
+model: ppl-hub-pi2
+display-name: "ppl Hub (Raspberry Pi 2)"
diff --git a/boards/rpi3.yaml b/boards/rpi3.yaml
index 470e639..40c2959 100644
--- a/boards/rpi3.yaml
+++ b/boards/rpi3.yaml
@@ -1,4 +1,5 @@
 architecture: armhf
-gadget: pi3
-kernel: pi2-kernel
-
+gadget: pi3=18
+kernel: pi-kernel=18-pi3
+model: ppl-hub-pi3
+display-name: "ppl Hub (Raspberry Pi 3)"
diff --git a/definition.yaml b/definition.yaml
index 5ce759e..03e63d0 100644
--- a/definition.yaml
+++ b/definition.yaml
@@ -1,7 +1,7 @@
 # basic
 type: model
 series: "16"
-model: ppl-hub
+base: core18
 # snaps to be preinstalled:
 required-snaps:
  - nextcloud # just for proof-of-concept