diff --git a/.drone.yml b/.drone.yml
index 79258ca..511ed17 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,13 +1,55 @@
 ---
-kind: template
-load: build-image.yaml
-data:
-  name: "RaspberryPi 2"
-  defconfig: "rpi2_defconfig"
+kind: pipeline
+type: vm
+name: Build for RPI2
+
+pool:
+  use: do-docker-20-04
+
+steps:
+- name: submodules
+  commands:
+    - git submodule update --init --recursive
+
+- name: dependencies
+  environment:
+    DEBIAN_FRONTEND: noninteractive
+  commands:
+  - apt-get update
+  - apt-get install -y sed make binutils build-essential diffutils gcc g++ bash patch gzip bzip2 perl tar cpio unzip rsync file bc findutils wget
+
+- name: configure
+  commands:
+    - ./buildroot_make.sh rpi2_defconfig
+
+- name: build
+  commands:
+    - ./buildroot_make.sh -j4
 
 ---
-kind: template
-load: build-image.yaml
-data:
-  name: "TLT113i-miniEVM"
-  defconfig: "tlt113_minievm_defconfig"
+kind: pipeline
+type: vm
+name: Build for T113i
+
+pool:
+  use: do-docker-20-04
+
+steps:
+- name: submodules
+  commands:
+    - git submodule update --init --recursive
+
+- name: dependencies
+  environment:
+    DEBIAN_FRONTEND: noninteractive
+  commands:
+  - apt-get update
+  - apt-get install -y sed make binutils build-essential diffutils gcc g++ bash patch gzip bzip2 perl tar cpio unzip rsync file bc findutils wget
+
+- name: configure
+  commands:
+    - ./buildroot_make.sh tlt113_minievm_defconfig
+
+- name: build
+  commands:
+    - ./buildroot_make.sh -j4
diff --git a/.drone/NOTE b/.drone/NOTE
deleted file mode 100644
index 0b1b8f1..0000000
--- a/.drone/NOTE
+++ /dev/null
@@ -1 +0,0 @@
-This directory is only used to store the files as a reference, the actual templates are stored on Drone server.
diff --git a/.drone/build-image.yaml b/.drone/build-image.yaml
deleted file mode 100644
index 49a9f25..0000000
--- a/.drone/build-image.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-kind: pipeline
-type: vm
-name: Build Image for {{ .input.name }}
-
-pool:
-  use: do-docker-20-04
-
-steps:
-- name: Submodules for {{ .input.name }}
-  commands:
-    - git submodule update --init --recursive
-
-- name: Install dependencies for {{ .input.name }}
-  environment:
-    DEBIAN_FRONTEND: noninteractive
-  commands:
-  - apt-get update
-  - apt-get install -y sed make binutils build-essential diffutils gcc g++ bash patch gzip bzip2 perl tar cpio unzip rsync file bc findutils wget
-
-- name: Configure for {{ .input.name }}
-  commands:
-    - ./buildroot_make.sh {{ .input.defconfig }}
-
-- name: Build image for {{ .input.name }}
-  commands:
-    - ./buildroot_make.sh -j4
-